diff --git a/SparklePony.cs b/SparklePony.cs
deleted file mode 100644
index f929c907..00000000
--- a/SparklePony.cs
+++ /dev/null
@@ -1,512 +0,0 @@
-//   SparklePony 0.0.2
-//
-//   SparklePony, an instant update workflow to Git.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
-//
-//   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//   Dependencies: 
-//             mono-core
-//             gtk-sharp2
-//             gtk-sharp2-devel
-//             notify-sharp
-//             notify-sharp-devel
-//             dbus-sharp
-//
-//   Compile: 
-//             gmcs -pkg:gtk-sharp-2.0 -pkg:notify-sharp SparklePony.cs
-//
-//   Run:
-//             mono SparklePony.exe
-
-using Gtk;
-using System;
-using System.IO;
-using System.Diagnostics;
-using System.Timers;
-using Notifications;
-using System.Text.RegularExpressions;
-
-public class SparklePony {
-
-	public static void Main () {
-		Gtk.Application.Init ();
-		SparklePonyUI SparklePonyUI = new SparklePonyUI ();
-		SparklePonyUI.StartMonitoring ();
-		Gtk.Application.Run ();
-	}
-
-}
-
-public class SparklePonyUI {
-
-	public SparklePonyWindow SparklePonyWindow;
-	public SparklePonyStatusIcon SparklePonyStatusIcon;
-	public string FoldersPath;
-	public string UserHome;
-	public Repository [] Repositories;
-
-	public SparklePonyUI () {
-
-		Process Process = new Process();
-		Process.EnableRaisingEvents = false;
-		Process.StartInfo.RedirectStandardOutput = true;
-		Process.StartInfo.UseShellExecute = false;
-
-		// Get home folder, example: "/home/user" 
-		Process.StartInfo.FileName = "whoami";
-		Process.StartInfo.Arguments = "";
-		Process.Start();
-		UserHome = "/home/" + Process.StandardOutput.ReadToEnd().Trim () + "/";
-
-		// Create 'Collaboration' folder in the user's home folder
-		FoldersPath = UserHome + "/Collaboration";
-		if (!Directory.Exists (FoldersPath)) {
-			Directory.CreateDirectory (FoldersPath);
-			Console.WriteLine ("Created '" + FoldersPath + "'");
-		}
-
-		// Get all the folders in ~/Collaboration
-		string [] Folders = Directory.GetDirectories (FoldersPath);
-		Repositories = new Repository [Folders.Length];
-
-		int i = 0;
-		foreach (string Folder in Folders) {
-			Repositories [i] = new Repository (Folder);
-			i++;
-		}
-
-		// Create the window
-		SparklePonyWindow = new SparklePonyWindow (Repositories);
-		SparklePonyWindow.DeleteEvent += CloseSparklePonyWindow;
-
-		// Create the status icon
-		SparklePonyStatusIcon = new SparklePonyStatusIcon ();
-		SparklePonyStatusIcon.Activate += delegate  { SparklePonyWindow.ToggleVisibility (); };
-
-	}
-
-	public void CloseSparklePonyWindow (object o, DeleteEventArgs args) {
-		SparklePonyWindow = new SparklePonyWindow (Repositories);
-		SparklePonyWindow.DeleteEvent += CloseSparklePonyWindow;
-	}
-
-	public void StartMonitoring () {	}
-	public void StopMonitoring () { }
-
-}
-
-public class SparklePonyStatusIcon : StatusIcon {
-
-	public SparklePonyStatusIcon () : base ()  {
-		IconName = "folder-remote";
-		// Activate += delegate (object o, EventArgs args) { SetSyncingState (); };
-	}
-
-	public void SetIdleState () {
-		IconName = "folder-remote";
-	}
-
-	public void SetSyncingState () {
-		IconName = "view-refresh"; // Massively abusing this icon here :)
-	}
-
-}
-
-public class AutoFetcher {
-
-	private Timer Timer;
-
-	public AutoFetcher (Repository Repository) {
-		Timer = new Timer();
-		// Fetch changes every 30 seconds
-		Timer.Interval = 30000;
-		Timer.Elapsed += delegate (object o, ElapsedEventArgs args) { Repository.Fetch (); };
-		Timer.Start();
-	}
-
-	public void StartTimer () {
-		Timer.Start ();
-	}
-
-	public void StopTimer () {
-		Timer.Stop ();
-	}
-
-	public bool isRunning () {
-		return Timer.Enabled;
-	}
-
-}
-
-public class Repository {
-
-	private Process Process;
-	private Timer Timer;
-	private Timer BufferTimer;
-	private FileSystemWatcher Watcher;
-
-	public string Name;
-	public string Domain;
-	public string RepoPath;
-	public string RemoteOriginUrl;
-	public string CurrentHash;
-
-	public string UserEmail;
-	public string UserName;
-	public bool MonitorOnly;
-
-	public Repository (string Path) {
-
-		Process = new Process();
-		Process.EnableRaisingEvents = false; 
-		Process.StartInfo.RedirectStandardOutput = true;
-		Process.StartInfo.UseShellExecute = false;
-
-		RepoPath = Path;
-		Process.StartInfo.WorkingDirectory = RepoPath;
-
-		// Get user.name, example: "User Name"
-		UserName = "Anonymous";
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "config --get user.name";
-		Process.Start();
-		UserName = Process.StandardOutput.ReadToEnd().Trim ();
-
-		// Get user.email, example: "user@github.com"
-		UserEmail = "not.set@git-scm.com";
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "config --get user.email";
-		Process.Start();
-		UserEmail = Process.StandardOutput.ReadToEnd().Trim ();
-
-		// Get remote.origin.url, example: "ssh://git@github.com/user/repo"
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "config --get remote.origin.url";
-		Process.Start();
-		RemoteOriginUrl = Process.StandardOutput.ReadToEnd().Trim ();
-
-		// Get the repository name, example: "project"
-		Name = RepoPath.Substring (RepoPath.LastIndexOf ("/") + 1);
-
-		// Get the domain, example: "github.com" 
-		Domain = RemoteOriginUrl; 
-		Domain = Domain.Substring (Domain.IndexOf ("@") + 1);
-		Domain = Domain.Substring (0, Domain.IndexOf ("/"));
-
-		// Get hash of the current commit
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "rev-list --max-count=1 HEAD";
-		Process.Start();
-		CurrentHash = Process.StandardOutput.ReadToEnd().Trim ();
-
-
-		// TODO: This does not belong in this class...
-		// Watch the repository's folder
-		Watcher = new FileSystemWatcher (RepoPath);
-		Watcher.IncludeSubdirectories = true;
-		Watcher.EnableRaisingEvents = true;
-		Watcher.Filter = "*";
-		Watcher.Changed += new FileSystemEventHandler(OnFileActivity);
-		Watcher.Created += new FileSystemEventHandler(OnFileActivity);
-		Watcher.Deleted += new FileSystemEventHandler(OnFileActivity);
-
-
-		// Call Fetch () every 30 seconds
-		BufferTimer = new Timer ();
-		Timer = new Timer();
-		Timer.Interval = 30000; //TODO: Make this have get/set
-		Timer.Elapsed += new ElapsedEventHandler(Fetch);
-		Timer.Start();
-
-
-// TODO: uncomment when status checking is implemented
-//		Add ();
-
-	}
-
-	public void StartBufferTimer () {
-		int Interval = 3000;
-		if (!BufferTimer.Enabled) {	
-			// Delay for a few seconds to see if more files change
-			BufferTimer.Interval = Interval; 
-			BufferTimer.Elapsed += delegate (object o, ElapsedEventArgs args) { Add (); } ;
-			Console.WriteLine ("Waiting for more changes...");
-			BufferTimer.Start();
-		} else {
-			// Extend the delay when something changes
-			BufferTimer.Close ();
-			BufferTimer = new Timer ();
-			BufferTimer.Interval = 3000;
-			BufferTimer.Elapsed += delegate (object o, ElapsedEventArgs args) { Add (); } ;
-			BufferTimer.Start();
-			Console.WriteLine ("Waiting for more changes...");
-		}
-	}
-
-	public void OnFileActivity (object o, FileSystemEventArgs args) {
-       WatcherChangeTypes wct = args.ChangeType;
-		 if (!ShouldIgnore (args.Name)) {
-	      Console.WriteLine(wct.ToString() + " '" + args.Name + "'");
-			StartBufferTimer ();
-		} else {
-			// Console.WriteLine("[ignore] " + wct.ToString() + " '" + args.Name + "'");
-		}
-	}
-
-	public void Clone () {
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "clone " + RemoteOriginUrl;
-		Process.Start();
-		// TODO: Add a gitignore file for *~
-	}
-
-	public void Add () {
-		Console.WriteLine ("Done waiting.");
-		BufferTimer.Stop ();
-		Console.WriteLine ("Staging changes...");
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "add --all";
-		Process.Start();
-		// TODO: Format the commit message here
-		// TODO: Only commit if there are changes
-		Commit ("Stuff happened");
-	}
-
-	public void Commit (string Message) {
-		Console.WriteLine ("Commiting changes...");
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "commit -m '" + Message + "'";
-		ShowNotification ("Stuff happened", "");
-		Process.Start();
-		Fetch ();
-		Push ();
-	}
-
-	public void Fetch () {
-		Timer.Stop ();
-		Console.WriteLine ("Fetching changes...");
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "fetch";
-		Process.Start();
-		Merge ();
-	}
-
-	public void Fetch (object o, ElapsedEventArgs args) {
-		Console.WriteLine ("Fetching changes...");
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "fetch";
-		Process.Start();
-		Merge ();
-	}
-
-	public void Merge () {
-		Timer.Stop ();
-		Watcher.EnableRaisingEvents = false;
-		Console.WriteLine ("Merging fetched changes...");
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "merge origin/master";
-		Process.Start();
-		Process.WaitForExit ();
-		// TODO: Notify user with the last fetched commit
-		Watcher.EnableRaisingEvents = true;
-		Timer.Start ();
-	}
-
-	public void Push () {
-		// TODO: Ping first, then push
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "push";
-		Process.Start();
-		Console.WriteLine ("Pushing changes...");
-		Process.WaitForExit ();
-	}
-
-	// Ignore folders, dotfiles, swap files and the like.
-	public bool ShouldIgnore (string s) {
-		if (s.Substring (0, 1).Equals (".") ||
-			 s.Contains (".lock") ||
-			 s.Contains (".git") ||
-			 s.Contains ("/.") ||
-			 Directory.Exists (Process.StartInfo.WorkingDirectory + "/" + s))
-			return true; // Yes, ignore it.
-		else if (s.Length > 3 && s.Substring (s.Length - 4).Equals (".swp"))
-			return true;
-		else return false;
-	}
-
-	// Can potentially be moved from this class as well
-	public void ShowNotification (string Title, string SubText) {
-		Notification Notification = new Notification (Title, SubText);
-		Notification.IconName = "folder-remote";
-		Notification.Urgency = Urgency.Low;
-		Notification.Timeout = 3000;
-
-		// Add a button to open the folder the changed file resides in
-//		Notification.AddAction(File, "Open Folder", 
-	//	                       delegate (object o, ActionArgs args) {
-		//                       	Process.StartInfo.FileName = "nautilus";
-		  //                     	Process.StartInfo.Arguments = "'" + Directory.GetParent (RepoPath + "/" + File) + "'";
-		    //                   	Process.Start();									     
-		      //                 } );
-		Notification.Show ();
-	}
-
-}
-
-public class SparklePonyWindow : Window {
-
-	private bool Visibility;
-
-	public SparklePonyWindow (Repository [] Repositories) : base ("Collaboration Folders")  {
-
-		Visibility = false;
-		SetSizeRequest (640, 480);
- 		SetPosition (WindowPosition.Center);
-		BorderWidth = 6;
-		IconName = "folder-remote";
-
-		ListStore FoldersStore = new ListStore (typeof (Gdk.Pixbuf), typeof (string), typeof (string));
-		string RemoteFolderIcon = "/usr/share/icons/gnome/16x16/places/folder-remote.png";
-
-		foreach (Repository Repository in Repositories)
-			FoldersStore.AppendValues (new Gdk.Pixbuf (RemoteFolderIcon), Repository.Name);
-
-		TreeView FoldersView = new TreeView (FoldersStore); 
-		FoldersView.AppendColumn ("", new Gtk.CellRendererPixbuf (), "pixbuf", 0);  
-		FoldersView.AppendColumn ("", new Gtk.CellRendererText (), "text", 1);
-
-		HBox AddRemoveButtons = new HBox ();
-		Button AddButton = new Button ("Add...");
-		Button RemoveButton = new Button ("Remove");
-
-		AddRemoveButtons.PackStart (AddButton, true, true, 0);
-		AddRemoveButtons.PackStart (RemoveButton, false, false, 0);
-
-		Process Process = new Process();
-		Process.EnableRaisingEvents = false; 
-		Process.StartInfo.RedirectStandardOutput = true;
-		Process.StartInfo.UseShellExecute = false;
-
-		// TODO: fix hard coding, system independant
-		Process.StartInfo.WorkingDirectory = "/home/hbons/Collaboration/Deal";
-
-		Process.StartInfo.FileName = "git";
-		Process.StartInfo.Arguments = "log --pretty=oneline -20";
-		Process.Start();
-
-		string Output = Process.StandardOutput.ReadToEnd().Trim ();
-
-		ListStore LogStore = new ListStore (typeof (string), typeof (string), typeof (string));
-
-		foreach (string Message in Regex.Split (Output, "\n"))
-			LogStore.AppendValues (Message.Substring (41), "Deal", "2 hours ago");
-
-		TreeView LogView = new TreeView (LogStore); 
-		LogView.AppendColumn ("What?", new Gtk.CellRendererText (), "text", 0);  
-		LogView.AppendColumn ("Where?", new Gtk.CellRendererText (), "text", 1);
-		LogView.AppendColumn ("When?", new Gtk.CellRendererText (), "text", 2);
-		
-		ScrolledWindow ScrolledWindow = new ScrolledWindow ();
-		ScrolledWindow.AddWithViewport (LogView);
-		ScrolledWindow.BorderWidth = 12;
-
-		VBox LayoutVerticalLeft = new VBox (false, 0);
-		LayoutVerticalLeft.PackStart (FoldersView, true, true, 0);
-		LayoutVerticalLeft.PackStart (AddRemoveButtons, false, false, 0);
-
-		LayoutVerticalLeft.BorderWidth = 12;
-
-		VBox LayoutVerticalRight = new VBox ();
-
-		// TODO: Fix this, it's hardcoded
-
-		Label Label1 = new Label ("Remote URL:");
-		Label1.UseMarkup = true;
-		Label1.SetAlignment (0, 0);
-
-		Label Label2 = new Label ("<b>ssh://git@github.com/hbons/Deal.git</b>");
-		Label2.UseMarkup = true;
-		Label2.SetAlignment (0, 0);
-
-
-		Label Label5 = new Label ("Path:");
-		Label5.UseMarkup = true;
-		Label5.SetAlignment (0, 0);
-
-		Label Label6 = new Label ("<b>~/Collaboration/Deal</b>");
-		Label6.UseMarkup = true;
-		Label6.SetAlignment (0, 0);
-
-		Button NotificationsCheckButton = new CheckButton ("Notify me when something changes");
-		Button ChangesCheckButton = new CheckButton ("Synchronize my changes");
-
-		Table Table = new Table(6, 2, false);
-		Table.RowSpacing = 6;
-
-		Table.Attach(Label1, 0, 1, 0, 1);
-		Table.Attach(Label2, 1, 2, 0, 1);
-		Table.Attach(Label5, 0, 1, 1, 2);
-		Table.Attach(Label6, 1, 2, 1, 2);
-		Table.Attach(NotificationsCheckButton, 0, 2, 3, 4);
-		Table.Attach(ChangesCheckButton, 0, 2, 4, 5);
-
-
-		LayoutVerticalRight.PackStart (Table, false, false, 24);
-	
-
-
-		HBox LayoutHorizontal = new HBox (false, 12);
-		LayoutHorizontal.PackStart (LayoutVerticalLeft, false, false, 0);
-		LayoutHorizontal.PackStart (LayoutVerticalRight, true, true, 0);
-
-		Notebook Notebook = new Notebook ();
-		Notebook.AppendPage (LayoutHorizontal, new Label ("Folders"));
-		Notebook.AppendPage (ScrolledWindow, new Label ("Events"));
-
-
-		VBox LayoutVertical = new VBox (false, 0);
-		Button CloseButton = new Button (Stock.Close);
-
-		HButtonBox DialogButtons = new HButtonBox ();
-		DialogButtons.BorderWidth = 6;
-		Notebook.BorderWidth = 6;
-		Button QuitButton = new Button ("Quit Service");
-		QuitButton.Clicked += Quit;
-		DialogButtons.Add (QuitButton);
-		DialogButtons.Add (CloseButton);
-
-		CloseButton.Clicked += delegate (object o, EventArgs args) { HideAll (); Visibility = false; };
-		LayoutVertical.PackStart (Notebook, true, true, 0);
-		LayoutVertical.PackStart (DialogButtons, false, false, 0);
-		Add (LayoutVertical);
-
-	}
-
-	// General options: [X] Run at startup. [X]
-
-	public void Quit (object o, EventArgs args) {
-		Application.Quit ();
-	}
-
-	public void ToggleVisibility() {
-		if (Visibility) {
-			if (HasFocus)
-				HideAll ();
-		} else {
-			ShowAll ();
-		}
-	}
-
-}