diff --git a/lib/rippr.rb b/lib/rippr.rb
index 7242284..488a119 100644
--- a/lib/rippr.rb
+++ b/lib/rippr.rb
@@ -4,32 +4,4 @@ require 'musicbrainz'
 require 'musicbrainz_discid'
 require 'rippr/version'
 
-module Rippr
-  class MetaData
-    attr_accessor :releases
-
-    def initialize(discid)
-      MusicBrainz.configure do |c|
-        c.app_name = "Rippr"
-        c.app_version = "0.1"
-        c.contact = "rippr@danbarber.me"
-      end
-      @discid = discid
-    end
-
-    def choose_release
-      return releases[0] if releases.count == 1
-      puts "There are multiple matches, please choose:"
-      releases.to_enum.with_index(1) do |release, index|
-        puts "#{index}: #{release.title} (#{release.country})"
-      end
-      print "Choose a release: "
-      index = STDIN.gets.chomp.to_i
-      releases[index - 1] unless index.zero?
-    end
-
-    def releases
-      @releases ||= MusicBrainz::Release.find_by_discid(@discid)
-    end
-  end
-end
+require 'rippr/metadata'
diff --git a/lib/rippr/metadata.rb b/lib/rippr/metadata.rb
new file mode 100644
index 0000000..f2e2a03
--- /dev/null
+++ b/lib/rippr/metadata.rb
@@ -0,0 +1,37 @@
+module Rippr
+  class MetaData
+    attr_accessor :releases
+
+    def initialize(discid)
+      MusicBrainz.configure do |c|
+        c.app_name = "Rippr"
+        c.app_version = "0.1"
+        c.contact = "rippr@danbarber.me"
+      end
+      @discid = discid
+    end
+
+    def choose_release
+      return releases[0] if releases.count == 1
+      puts "There are multiple matches, please choose:"
+      index = prompt_for_release
+      releases[index - 1] unless index.zero?
+    end
+
+    def list_releases
+      releases.to_enum.with_index(1) do |release, index|
+        puts "#{index}: #{release.title} (#{release.country})"
+      end
+    end
+
+    def prompt_for_release
+      list_releases
+      print "Choose a release: "
+      STDIN.gets.chomp.to_i
+    end
+
+    def releases
+      @releases ||= MusicBrainz::Release.find_by_discid(@discid)
+    end
+  end
+end