diff --git a/.gitmodules b/.gitmodules
index 2f64e000..f588b95e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,8 +5,8 @@
 	path = GitSharp
 	url = http://github.com/henon/GitSharp.git
 [submodule "MonoMac"]
-	path = lib/monomac
+	path = MonoMac
 	url = https://github.com/mono/monomac.git
 [submodule "MacCore"]
-	path = lib/maccore
-	url = https://github.com/mono/monomac.git	
+	path = MacCore
+	url = https://github.com/mono/maccore.git	
diff --git a/lib/TODO b/lib/TODO
deleted file mode 100644
index 9aae26c4..00000000
--- a/lib/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Move GitSharp, NotifySharp and SmartIrc4Net to here
diff --git a/lib/maccore b/lib/maccore
deleted file mode 160000
index da3e017c..00000000
--- a/lib/maccore
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit da3e017ccda1ce1c21777246151a5d7f21a3ffa5
diff --git a/lib/monomac b/lib/monomac
deleted file mode 160000
index 433483a4..00000000
--- a/lib/monomac
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 433483a484b8637b379265c38ebab643a8cfcc6a