diff --git a/.gitmodules b/.gitmodules
index b66465ec..2f64e000 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,8 +5,8 @@
 	path = GitSharp
 	url = http://github.com/henon/GitSharp.git
 [submodule "MonoMac"]
-	path = lib/MonoMac
+	path = lib/monomac
 	url = https://github.com/mono/monomac.git
 [submodule "MacCore"]
-	path = lib/MacCore
+	path = lib/maccore
 	url = https://github.com/mono/monomac.git	
diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs
index 2779f00e..38c16ae6 100644
--- a/SparkleShare/SparkleShare.cs
+++ b/SparkleShare/SparkleShare.cs
@@ -30,6 +30,8 @@ namespace SparkleShare {
 
 		public static SparkleController Controller;
 		public static SparkleUI UI;
+		
+		// TODO: Move to Controller
 		public static string UserName  = "";
 		public static string UserEmail = "";
 
diff --git a/lib/maccore b/lib/maccore
new file mode 160000
index 00000000..da3e017c
--- /dev/null
+++ b/lib/maccore
@@ -0,0 +1 @@
+Subproject commit da3e017ccda1ce1c21777246151a5d7f21a3ffa5
diff --git a/lib/monomac b/lib/monomac
new file mode 160000
index 00000000..433483a4
--- /dev/null
+++ b/lib/monomac
@@ -0,0 +1 @@
+Subproject commit 433483a484b8637b379265c38ebab643a8cfcc6a