CueSheets: Moved sources. Tried to add Playlist.Formats support, but it's all internal and not enough interfaces.

21 files changed, 203 insertions, 174 deletions

diff --git a/src/CueSheets/Banshee.CueSheets/CueSheet.cs b/src/CueSheets/Banshee.CueSheets/CueSheet/CueSheet.cs
index 3c7b2b2..0d44e15 100644
--- a/src/CueSheets/Banshee.CueSheets/CueSheet.cs
+++ b/src/CueSheets/Banshee.CueSheets/CueSheet/CueSheet.cs
@@ -31,6 +31,9 @@ using System.Text.RegularExpressions;
 using Banshee.CueSheets;
 using Banshee.Collection;
 using Banshee.Base;
+using Banshee.Playlists.Formats;
+using System.Collections.Generic;
+using Hyena;
 
 namespace Banshee.CueSheets
 {
@@ -50,7 +53,7 @@ namespace Banshee.CueSheets
 		private string				_composer;
 		private string				_subtitle;
 		private string 				_cddbId;
-		
+
 		public string id() {
 			return "title="+_title+";performer="+_performer+
 				   ";year="+_year+";composer="+_composer;
@@ -280,10 +283,10 @@ namespace Banshee.CueSheets
 			if (!File.Exists (_cuefile+".bck")) {
 				File.Copy (_cuefile,_cuefile+".bck");
 			}
-			resetArt ();
 			System.IO.StreamWriter wrt=new System.IO.StreamWriter(_cuefile);
+			resetArt ();
 			indent="";
-			wrtl(wrt,"creator","Banshee CueSheets Extension",true);
+			wrtl (wrt,"creator","Banshee CueSheets Extension",true);
 			wrtl (wrt,"creator-version",CS_Info.Version (),true);
 			wrtl (wrt,"banshee-aaid",getArtId (),true);
 			wrtl (wrt,"image",_image_file_name,true);
@@ -299,18 +302,21 @@ namespace Banshee.CueSheets
 			int i,N;
 			for(i=0,N=nEntries ();i<N;i++) {
 				CueSheetEntry e=_tracks[i];
-				indent="  ";
-				wrtl_track(wrt,i+1);
-				indent="    ";
-				wrtl (wrt,"title",e.title ());
-				wrtl (wrt,"performer",e.performer ());
-				wrtl (wrt,"piece",e.getPiece (),true);
-				wrtl (wrt,"composer",e.getComposer (),true);
-				wrtl_index(wrt,1,e.offset ());
+				writeEntry(wrt,e,i);
 			}
 			
 			wrt.Close ();
-			
+		}
+		
+		void writeEntry(StreamWriter wrt,CueSheetEntry e,int i) {
+			indent="  ";
+			wrtl_track(wrt,i+1);
+			indent="    ";
+			wrtl (wrt,"title",e.title ());
+			wrtl (wrt,"performer",e.performer ());
+			wrtl (wrt,"piece",e.getPiece (),true);
+			wrtl (wrt,"composer",e.getComposer (),true);
+			wrtl_index(wrt,1,e.offset ());
 		}
 		
 		static private Regex unq1=new Regex("^[\"]");
@@ -321,13 +327,19 @@ namespace Banshee.CueSheets
 		}
 		
 		public void iLoad() {
+			string filename=_cuefile;
+			using (System.IO.StreamReader sr = System.IO.File.OpenText(filename)) {
+				iLoad (sr);
+			}
+		}
+		
+		public void iLoad(StreamReader sr) {
 		
 			_composer="";
 			_year="";
 			_subtitle="";
 			_cddbId="";
 			
-			
 			Boolean _in_tracks=false;
 			string e_perf="";
 			string e_title="";
@@ -337,114 +349,112 @@ namespace Banshee.CueSheets
 			string aaid="";
 			int nr=0;
 			
-			string filename=_cuefile;
+			//string filename=_cuefile;
 			string directory=_directory;
 			
-			using (System.IO.StreamReader sr = System.IO.File.OpenText(filename)) {
-	            string line = "";
-            	while ((line = sr.ReadLine()) != null) {
-					line=line.Trim ();
-					if (line!="") {
-						//Console.WriteLine ("it="+_in_tracks+", "+line);
-						if (!_in_tracks) {
-							if (eq(line,"performer")) { 
-								_performer=unquote(line.Substring (9).Trim ());
-							} else if (eq(line,"title")) {
-								_title=unquote(line.Substring (5).Trim ());
-							} else if (eq(line,"file")) { 
-								_music_file_name=line.Substring (4).Trim ();
-								Match m=Regex.Match (_music_file_name,"([\"][^\"]+[\"])");
-								_music_file_name=m.ToString ();
-								_music_file_name=unquote(_music_file_name).Trim ();
-								_music_file_name=Tools.makefile(directory,_music_file_name);
-							} else if (line.Substring(0,5).ToLower ()=="track") {
-								_in_tracks=true;
-							} else if (eq(line,"rem")) {
-								//Hyena.Log.Information (line);
-								line=line.Substring (3).Trim ();
-								if (eq(line,"image")) { 
-									_image_file_name=line.Substring (5).Trim ();
-									_image_file_name=unquote(_image_file_name).Trim ();
-									_img_full_path=Tools.makefile(directory,_image_file_name);
-								} else if (eq (line,"composer")) {
-									_composer=unquote(line.Substring (8).Trim ());
-								} else if (eq (line,"subtitle")) {
-									_subtitle=unquote(line.Substring (8).Trim ());
-								} else if (eq (line,"year")) {
-									_year=unquote(line.Substring (4).Trim ());
-								} else if (eq (line,"cddbid")) {
-									_cddbId=unquote(line.Substring (6).Trim ());
-								}
+            string line = "";
+        	while ((line = sr.ReadLine()) != null) {
+				line=line.Trim ();
+				if (line!="") {
+					//Console.WriteLine ("it="+_in_tracks+", "+line);
+					if (!_in_tracks) {
+						if (eq(line,"performer")) { 
+							_performer=unquote(line.Substring (9).Trim ());
+						} else if (eq(line,"title")) {
+							_title=unquote(line.Substring (5).Trim ());
+						} else if (eq(line,"file")) { 
+							_music_file_name=line.Substring (4).Trim ();
+							Match m=Regex.Match (_music_file_name,"([\"][^\"]+[\"])");
+							_music_file_name=m.ToString ();
+							_music_file_name=unquote(_music_file_name).Trim ();
+							_music_file_name=Tools.makefile(directory,_music_file_name);
+						} else if (line.Substring(0,5).ToLower ()=="track") {
+							_in_tracks=true;
+						} else if (eq(line,"rem")) {
+							//Hyena.Log.Information (line);
+							line=line.Substring (3).Trim ();
+							if (eq(line,"image")) { 
+								_image_file_name=line.Substring (5).Trim ();
+								_image_file_name=unquote(_image_file_name).Trim ();
+								_img_full_path=Tools.makefile(directory,_image_file_name);
+							} else if (eq (line,"composer")) {
+								_composer=unquote(line.Substring (8).Trim ());
+							} else if (eq (line,"subtitle")) {
+								_subtitle=unquote(line.Substring (8).Trim ());
+							} else if (eq (line,"year")) {
+								_year=unquote(line.Substring (4).Trim ());
+							} else if (eq (line,"cddbid")) {
+								_cddbId=unquote(line.Substring (6).Trim ());
 							}
-						} 
-						
-						
-						if (_in_tracks) {
-							if (aaid=="") { aaid=getArtId (); }
-	
-							//Console.WriteLine ("line="+line);
-							if (eq(line,"track")) { 
-								if (e_offset>=0) {
-									nr+=1;
-									CueSheetEntry e=new CueSheetEntry(_music_file_name,aaid,nr,-1,e_title,e_perf,_title,e_offset);
-									e.setComposer (e_composer);
-									e.setPiece (e_piece);
-									append (e);
-									if (nr>1) {
-										CueSheetEntry ePrev;
-										ePrev=this.entry (nr-2);
-										ePrev.setLength(e.offset ()-ePrev.offset());
-									}
+						}
+					} 
+					
+					
+					if (_in_tracks) {
+						if (aaid=="") { aaid=getArtId (); }
+
+						//Console.WriteLine ("line="+line);
+						if (eq(line,"track")) { 
+							if (e_offset>=0) {
+								nr+=1;
+								CueSheetEntry e=new CueSheetEntry(_music_file_name,aaid,nr,-1,e_title,e_perf,_title,e_offset);
+								e.setComposer (e_composer);
+								e.setPiece (e_piece);
+								append (e);
+								if (nr>1) {
+									CueSheetEntry ePrev;
+									ePrev=this.entry (nr-2);
+									ePrev.setLength(e.offset ()-ePrev.offset());
 								}
-								e_perf=_performer;
-								e_title="";
-								e_composer=_composer;
-								e_offset=-1.0;
-							} else if (eq(line,"title")) {
-								e_title=unquote(line.Substring (5).Trim ());
-							} else if (eq(line,"performer")) { 
-								e_perf=unquote(line.Substring (9).Trim ());
-							} else if (eq(line,"rem")) {
-								line=line.Substring (3).Trim ();
-								if (eq (line,"composer")) {
-									e_composer=unquote(line.Substring (8).Trim ());
-								} else if (eq(line,"piece")) {
-									e_piece=unquote(line.Substring (5).Trim ());
-								} 
-							} else if (eq(line,"index")) { 
-								string s=line.Substring (5).Trim ();
-								s=Regex.Replace (s,"^\\s*[0-9]+\\s*","");
-								string []parts=Regex.Split(s,"[:]");
-								int min=Convert.ToInt32(parts[0]);
-								int secs=Convert.ToInt32(parts[1]);
-								int hsecs=Convert.ToInt32(parts[2]);
-								e_offset=min*60+secs+(hsecs/100.0);
 							}
+							e_perf=_performer;
+							e_title="";
+							e_composer=_composer;
+							e_offset=-1.0;
+						} else if (eq(line,"title")) {
+							e_title=unquote(line.Substring (5).Trim ());
+						} else if (eq(line,"performer")) { 
+							e_perf=unquote(line.Substring (9).Trim ());
+						} else if (eq(line,"rem")) {
+							line=line.Substring (3).Trim ();
+							if (eq (line,"composer")) {
+								e_composer=unquote(line.Substring (8).Trim ());
+							} else if (eq(line,"piece")) {
+								e_piece=unquote(line.Substring (5).Trim ());
+							} 
+						} else if (eq(line,"index")) { 
+							string s=line.Substring (5).Trim ();
+							s=Regex.Replace (s,"^\\s*[0-9]+\\s*","");
+							string []parts=Regex.Split(s,"[:]");
+							int min=Convert.ToInt32(parts[0]);
+							int secs=Convert.ToInt32(parts[1]);
+							int hsecs=Convert.ToInt32(parts[2]);
+							e_offset=min*60+secs+(hsecs/100.0);
 						}
 					}
-    	        }
-				//Console.WriteLine ("Last entry adding");
-				if (e_offset>=0) {
-					nr+=1;
-					CueSheetEntry e=new CueSheetEntry(_music_file_name,aaid,nr,-1,e_title,e_perf,_title,e_offset);
-					e.setComposer (e_composer);
-					e.setPiece (e_piece);
-					append (e);
-					if (nr>1) {
-						CueSheetEntry ePrev;
-						ePrev=this.entry (nr-2);
-						ePrev.setLength(e.offset ()-ePrev.offset());
-					}
 				}
-				//Console.WriteLine ("Last entry added");
-				
-				{
-					int i;
-					for(i=0;i<nEntries();i++) {
-						entry (i).setNrOfTracks(nr);
-					}
-					//Console.WriteLine ("Ready");
+	        }
+			//Console.WriteLine ("Last entry adding");
+			if (e_offset>=0) {
+				nr+=1;
+				CueSheetEntry e=new CueSheetEntry(_music_file_name,aaid,nr,-1,e_title,e_perf,_title,e_offset);
+				e.setComposer (e_composer);
+				e.setPiece (e_piece);
+				append (e);
+				if (nr>1) {
+					CueSheetEntry ePrev;
+					ePrev=this.entry (nr-2);
+					ePrev.setLength(e.offset ()-ePrev.offset());
+				}
+			}
+			//Console.WriteLine ("Last entry added");
+			
+			{
+				int i;
+				for(i=0;i<nEntries();i++) {
+					entry (i).setNrOfTracks(nr);
 				}
+				//Console.WriteLine ("Ready");
 			}
 		}		
 		
diff --git a/src/CueSheets/Banshee.CueSheets/CueSheetEntry.cs b/src/CueSheets/Banshee.CueSheets/CueSheet/CueSheetEntry.cs
index 2c6a582..92fc533 100644
--- a/src/CueSheets/Banshee.CueSheets/CueSheetEntry.cs
+++ b/src/CueSheets/Banshee.CueSheets/CueSheet/CueSheetEntry.cs
@@ -29,19 +29,22 @@ using System;
 
 using Banshee.Collection;
 using Banshee.Base;
+using Hyena;
+using Banshee.IO.SystemIO;
+using Banshee.Playlists.Formats;
 
 namespace Banshee.CueSheets
 {
 	public class CueSheetEntry : TrackInfo
 	{
-		double 	_offset;
 		string 	_performer;
 		string  _composer="";
 		string  _piece="";
-		string 	_title;
 		string  _file;
-		double  _length;
+		TimeSpan _length;
 		string  _art="";
+		double	_offset;
+		string  _title;
 		
 		public override string ArtworkId {
       		get { return _art; }
@@ -71,9 +74,6 @@ namespace Banshee.CueSheets
 			this.TrackCount=n;
 		}
 		
-		public double length() {
-			return _length;
-		}
 		
 		public void setComposer(string c) {
 			_composer=c;
@@ -91,35 +91,49 @@ namespace Banshee.CueSheets
 			return _composer;
 		}
 		
+		public override TimeSpan Duration {
+			get {
+				return _length;
+			}
+			set {
+				_length=value;
+			}
+		}
+
+		public double length() {
+			return _length.TotalMilliseconds/1000.0;
+			//return _length;
+		}
+
 		public void setLength(double l) {
-			_length=l;
+			//_length=l;
 			System.Int64 ticks_100nanosecs=(System.Int64) (l*10000000); // 10 miljoen
-			this.Duration=new TimeSpan(ticks_100nanosecs);
+			_length=new TimeSpan(ticks_100nanosecs);
 		}
 		
 		public override string ToString() {
 			return "nr: "+this.TrackNumber+", title: "+this.title ()+", file: "+this.file ();
 		}
-		
-		public CueSheetEntry (string file,String artId,int nr,int cnt,string title,string performer,string album,double offset) {
+
+		public CueSheetEntry (string file,String artId,int nr,int cnt,string title,string performer,string album,double offset) : base() {
 			_file=file;
 			_title=title;
 			_performer=performer;
 			_offset=offset;
-			_length=-1.0;
+			_length=new TimeSpan(0);
 			
 			_art=artId;
-			this.AlbumArtist=performer;
-			this.TrackTitle=title;
-			this.AlbumTitle=album;
-			this.ArtistName=performer;
-			this.TrackNumber=nr;
-			this.TrackCount=cnt;
-			this.DiscNumber=1;
-			this.CanPlay=true;
-			this.CanSaveToDatabase=false;
-			this.Duration=new System.TimeSpan(0,0,10,0);
-			this.Uri=new Hyena.SafeUri(_file,false);
+			base.AlbumArtist=performer;
+			base.TrackTitle=title;
+			base.AlbumTitle=album;
+			base.ArtistName=performer;
+			base.TrackNumber=nr;
+			base.TrackCount=cnt;
+			base.DiscNumber=1;
+			base.CanPlay=true;
+			base.CanSaveToDatabase=false;
+			base.Duration=new System.TimeSpan(0,0,10,0);
+			base.Uri=new Hyena.SafeUri(_file,false);
 		}
 	}
 }
diff --git a/src/CueSheets/Banshee.CueSheets/CueSheetsSource.cs b/src/CueSheets/Banshee.CueSheets/CueSheetsSource.cs
index c5d0ccb..1e3c2f7 100644
--- a/src/CueSheets/Banshee.CueSheets/CueSheetsSource.cs
+++ b/src/CueSheets/Banshee.CueSheets/CueSheetsSource.cs
@@ -947,9 +947,6 @@ namespace Banshee.CueSheets
 				Gtk.TreeSelection selection = (sender as Gtk.TreeView).Selection;
 				Gtk.TreeModel model;
 				Gtk.TreeIter iter;
-				// THE ITER WILL POINT TO THE SELECTED ROW
-				//Hyena.Log.Information ("source="+ServiceManager.PlaybackController.Source);
-				//Hyena.Log.Information ("this="+this);
 				if (selection.GetSelected(out model, out iter)) {
 					if (ServiceManager.PlaybackController.Source != MySource) {
 						reLoad ();
diff --git a/src/CueSheets/Banshee.CueSheets/CS_AlbumInfo.cs b/src/CueSheets/Banshee.CueSheets/Data/CS_AlbumInfo.cs
index a135afd..a135afd 100644
--- a/src/CueSheets/Banshee.CueSheets/CS_AlbumInfo.cs
+++ b/src/CueSheets/Banshee.CueSheets/Data/CS_AlbumInfo.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CS_ArtistInfo.cs b/src/CueSheets/Banshee.CueSheets/Data/CS_ArtistInfo.cs
index 99ff628..99ff628 100644
--- a/src/CueSheets/Banshee.CueSheets/CS_ArtistInfo.cs
+++ b/src/CueSheets/Banshee.CueSheets/Data/CS_ArtistInfo.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CS_ComposerInfo.cs b/src/CueSheets/Banshee.CueSheets/Data/CS_ComposerInfo.cs
index efb948d..efb948d 100644
--- a/src/CueSheets/Banshee.CueSheets/CS_ComposerInfo.cs
+++ b/src/CueSheets/Banshee.CueSheets/Data/CS_ComposerInfo.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CS_TrackInfoDb.cs b/src/CueSheets/Banshee.CueSheets/Data/CS_TrackInfoDb.cs
index f070664..f070664 100644
--- a/src/CueSheets/Banshee.CueSheets/CS_TrackInfoDb.cs
+++ b/src/CueSheets/Banshee.CueSheets/Data/CS_TrackInfoDb.cs
diff --git a/src/CueSheets/Banshee.CueSheets/GenreInfo.cs b/src/CueSheets/Banshee.CueSheets/Data/GenreInfo.cs
index 3e914c0..3e914c0 100644
--- a/src/CueSheets/Banshee.CueSheets/GenreInfo.cs
+++ b/src/CueSheets/Banshee.CueSheets/Data/GenreInfo.cs
diff --git a/src/CueSheets/Banshee.CueSheets/ComposerListView.cs b/src/CueSheets/Banshee.CueSheets/Gui/ComposerListView.cs
index e80137d..e80137d 100644
--- a/src/CueSheets/Banshee.CueSheets/ComposerListView.cs
+++ b/src/CueSheets/Banshee.CueSheets/Gui/ComposerListView.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CueSheetEditor.cs b/src/CueSheets/Banshee.CueSheets/Gui/CueSheetEditor.cs
index 988f12e..988f12e 100644
--- a/src/CueSheets/Banshee.CueSheets/CueSheetEditor.cs
+++ b/src/CueSheets/Banshee.CueSheets/Gui/CueSheetEditor.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CueSheetsPrefs.cs b/src/CueSheets/Banshee.CueSheets/Gui/CueSheetsPrefs.cs
index 2807783..2807783 100644
--- a/src/CueSheets/Banshee.CueSheets/CueSheetsPrefs.cs
+++ b/src/CueSheets/Banshee.CueSheets/Gui/CueSheetsPrefs.cs
diff --git a/src/CueSheets/Banshee.CueSheets/GenreListView.cs b/src/CueSheets/Banshee.CueSheets/Gui/GenreListView.cs
index 89f0b58..89f0b58 100644
--- a/src/CueSheets/Banshee.CueSheets/GenreListView.cs
+++ b/src/CueSheets/Banshee.CueSheets/Gui/GenreListView.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CS_AlbumModel.cs b/src/CueSheets/Banshee.CueSheets/Model/CS_AlbumModel.cs
index d65d2f9..d65d2f9 100644
--- a/src/CueSheets/Banshee.CueSheets/CS_AlbumModel.cs
+++ b/src/CueSheets/Banshee.CueSheets/Model/CS_AlbumModel.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CS_ArtistModel.cs b/src/CueSheets/Banshee.CueSheets/Model/CS_ArtistModel.cs
index cfe459b..cfe459b 100644
--- a/src/CueSheets/Banshee.CueSheets/CS_ArtistModel.cs
+++ b/src/CueSheets/Banshee.CueSheets/Model/CS_ArtistModel.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CS_ComposerModel.cs b/src/CueSheets/Banshee.CueSheets/Model/CS_ComposerModel.cs
index a618634..a618634 100644
--- a/src/CueSheets/Banshee.CueSheets/CS_ComposerModel.cs
+++ b/src/CueSheets/Banshee.CueSheets/Model/CS_ComposerModel.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CS_GenreModel.cs b/src/CueSheets/Banshee.CueSheets/Model/CS_GenreModel.cs
index bad8784..bad8784 100644
--- a/src/CueSheets/Banshee.CueSheets/CS_GenreModel.cs
+++ b/src/CueSheets/Banshee.CueSheets/Model/CS_GenreModel.cs
diff --git a/src/CueSheets/Banshee.CueSheets/Loosely.cs b/src/CueSheets/Banshee.CueSheets/Tools/Loosely.cs
index 4fd8a74..4fd8a74 100644
--- a/src/CueSheets/Banshee.CueSheets/Loosely.cs
+++ b/src/CueSheets/Banshee.CueSheets/Tools/Loosely.cs
diff --git a/src/CueSheets/Banshee.CueSheets/Tools.cs b/src/CueSheets/Banshee.CueSheets/Tools/Tools.cs
index 376b7e8..376b7e8 100644
--- a/src/CueSheets/Banshee.CueSheets/Tools.cs
+++ b/src/CueSheets/Banshee.CueSheets/Tools/Tools.cs
diff --git a/src/CueSheets/Banshee.CueSheets/CS_Info.cs b/src/CueSheets/Banshee.CueSheets/Version/CS_Info.cs
index 758b862..723ad59 100644
--- a/src/CueSheets/Banshee.CueSheets/CS_Info.cs
+++ b/src/CueSheets/Banshee.CueSheets/Version/CS_Info.cs
@@ -9,7 +9,7 @@ namespace Banshee.CueSheets
 		}
 		
 		public static string Version() {
-			return "0.0.6";
+			return "0.0.7";
 		}
 		
 		public static string [] Authors() {
diff --git a/src/CueSheets/CueSheets.csproj b/src/CueSheets/CueSheets.csproj
index c4f7d93..207c57a 100644
--- a/src/CueSheets/CueSheets.csproj
+++ b/src/CueSheets/CueSheets.csproj
@@ -91,24 +91,24 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Banshee.CueSheets\CueSheetsSource.cs" />
-    <Compile Include="Banshee.CueSheets\CueSheet.cs" />
-    <Compile Include="Banshee.CueSheets\CueSheetEntry.cs" />
-    <Compile Include="Banshee.CueSheets\CS_AlbumInfo.cs" />
-    <Compile Include="Banshee.CueSheets\CS_AlbumModel.cs" />
-    <Compile Include="Banshee.CueSheets\CS_ArtistInfo.cs" />
-    <Compile Include="Banshee.CueSheets\CS_ArtistModel.cs" />
-    <Compile Include="Banshee.CueSheets\CS_GenreModel.cs" />
-    <Compile Include="Banshee.CueSheets\CueSheetsPrefs.cs" />
-    <Compile Include="Banshee.CueSheets\GenreInfo.cs" />
-    <Compile Include="Banshee.CueSheets\GenreListView.cs" />
-    <Compile Include="Banshee.CueSheets\Loosely.cs" />
-    <Compile Include="Banshee.CueSheets\CueSheetEditor.cs" />
-    <Compile Include="Banshee.CueSheets\CS_Info.cs" />
-    <Compile Include="Banshee.CueSheets\Tools.cs" />
-    <Compile Include="Banshee.CueSheets\CS_TrackInfoDb.cs" />
-    <Compile Include="Banshee.CueSheets\CS_ComposerInfo.cs" />
-    <Compile Include="Banshee.CueSheets\CS_ComposerModel.cs" />
-    <Compile Include="Banshee.CueSheets\ComposerListView.cs" />
+    <Compile Include="Banshee.CueSheets\CueSheet\CueSheet.cs" />
+    <Compile Include="Banshee.CueSheets\CueSheet\CueSheetEntry.cs" />
+    <Compile Include="Banshee.CueSheets\Data\CS_AlbumInfo.cs" />
+    <Compile Include="Banshee.CueSheets\Data\CS_ArtistInfo.cs" />
+    <Compile Include="Banshee.CueSheets\Data\CS_ComposerInfo.cs" />
+    <Compile Include="Banshee.CueSheets\Model\CS_AlbumModel.cs" />
+    <Compile Include="Banshee.CueSheets\Model\CS_ArtistModel.cs" />
+    <Compile Include="Banshee.CueSheets\Model\CS_ComposerModel.cs" />
+    <Compile Include="Banshee.CueSheets\Model\CS_GenreModel.cs" />
+    <Compile Include="Banshee.CueSheets\Gui\ComposerListView.cs" />
+    <Compile Include="Banshee.CueSheets\Gui\CueSheetsPrefs.cs" />
+    <Compile Include="Banshee.CueSheets\Gui\CueSheetEditor.cs" />
+    <Compile Include="Banshee.CueSheets\Data\GenreInfo.cs" />
+    <Compile Include="Banshee.CueSheets\Gui\GenreListView.cs" />
+    <Compile Include="Banshee.CueSheets\Tools\Loosely.cs" />
+    <Compile Include="Banshee.CueSheets\Tools\Tools.cs" />
+    <Compile Include="Banshee.CueSheets\Data\CS_TrackInfoDb.cs" />
+    <Compile Include="Banshee.CueSheets\Version\CS_Info.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
@@ -126,4 +126,12 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
+  <ItemGroup>
+    <Folder Include="Banshee.CueSheets\CueSheet\" />
+    <Folder Include="Banshee.CueSheets\Gui\" />
+    <Folder Include="Banshee.CueSheets\Data\" />
+    <Folder Include="Banshee.CueSheets\Model\" />
+    <Folder Include="Banshee.CueSheets\Tools\" />
+    <Folder Include="Banshee.CueSheets\Version\" />
+  </ItemGroup>
 </Project>
diff --git a/src/CueSheets/Makefile.am b/src/CueSheets/Makefile.am
index acfe571..f62cecc 100644
--- a/src/CueSheets/Makefile.am
+++ b/src/CueSheets/Makefile.am
@@ -2,25 +2,25 @@ ASSEMBLY = Banshee.CueSheets
 LINK = $(BANSHEE_LIBS)
 
 SOURCES =  \
-	Banshee.CueSheets/ComposerListView.cs \
-	Banshee.CueSheets/CS_AlbumInfo.cs \
-	Banshee.CueSheets/CS_AlbumModel.cs \
-	Banshee.CueSheets/CS_ArtistInfo.cs \
-	Banshee.CueSheets/CS_ArtistModel.cs \
-	Banshee.CueSheets/CS_ComposerInfo.cs \
-	Banshee.CueSheets/CS_ComposerModel.cs \
-	Banshee.CueSheets/CS_GenreModel.cs \
-	Banshee.CueSheets/CS_Info.cs \
-	Banshee.CueSheets/CS_TrackInfoDb.cs \
-	Banshee.CueSheets/CueSheet.cs \
-	Banshee.CueSheets/CueSheetEditor.cs \
-	Banshee.CueSheets/CueSheetEntry.cs \
-	Banshee.CueSheets/CueSheetsPrefs.cs \
+	Banshee.CueSheets/CueSheet/CueSheet.cs \
+	Banshee.CueSheets/CueSheet/CueSheetEntry.cs \
 	Banshee.CueSheets/CueSheetsSource.cs \
-	Banshee.CueSheets/GenreInfo.cs \
-	Banshee.CueSheets/GenreListView.cs \
-	Banshee.CueSheets/Loosely.cs \
-	Banshee.CueSheets/Tools.cs
+	Banshee.CueSheets/Data/CS_AlbumInfo.cs \
+	Banshee.CueSheets/Data/CS_ArtistInfo.cs \
+	Banshee.CueSheets/Data/CS_ComposerInfo.cs \
+	Banshee.CueSheets/Data/CS_TrackInfoDb.cs \
+	Banshee.CueSheets/Data/GenreInfo.cs \
+	Banshee.CueSheets/Gui/ComposerListView.cs \
+	Banshee.CueSheets/Gui/CueSheetEditor.cs \
+	Banshee.CueSheets/Gui/CueSheetsPrefs.cs \
+	Banshee.CueSheets/Gui/GenreListView.cs \
+	Banshee.CueSheets/Model/CS_AlbumModel.cs \
+	Banshee.CueSheets/Model/CS_ArtistModel.cs \
+	Banshee.CueSheets/Model/CS_ComposerModel.cs \
+	Banshee.CueSheets/Model/CS_GenreModel.cs \
+	Banshee.CueSheets/Tools/Loosely.cs \
+	Banshee.CueSheets/Tools/Tools.cs \
+	Banshee.CueSheets/Version/CS_Info.cs
 
 RESOURCES = CueSheets.addin.xml