diff --git a/.gitmodules b/.gitmodules
index 9f55646..eefe7a2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
-[submodule "wp"]
-	path = wp
-	url = git://github.com/WordPress/WordPress.git
-[submodule "content/jetpack"]
-	path = content/jetpack
-	url = gh:automattic/jetpack
-[submodule "google-analytics-for-wordpress"]
-	path = google-analytics-for-wordpress
-	url = gh:Yoast/google-analytics-for-wordpress
-[submodule "content/infinite-scroll"]
-	path = content/infinite-scroll
-	url = gh:paulirish/infinite-scroll
 [submodule "content/themes/decode"]
 	path = content/themes/decode
 	url = gh:ScottSmith95/Decode
+[submodule "wordpress"]
+	path = wordpress
+	url = git://github.com/WordPress/WordPress.git
+[submodule "content/plugins/google-analytics-for-wordpress"]
+	path = content/plugins/google-analytics-for-wordpress
+	url = git://github.com/Yoast/google-analytics-for-wordpress
+[submodule "content/plugins/infinite-scroll"]
+	path = content/plugins/infinite-scroll
+	url = git://github.com/paulirish/infinite-scroll.git
+[submodule "content/plugins/jetpack"]
+	path = content/plugins/jetpack
+	url = git://github.com/Automattic/jetpack
diff --git a/google-analytics-for-wordpress b/content/plugins/google-analytics-for-wordpress
similarity index 100%
rename from google-analytics-for-wordpress
rename to content/plugins/google-analytics-for-wordpress
diff --git a/content/infinite-scroll b/content/plugins/infinite-scroll
similarity index 100%
rename from content/infinite-scroll
rename to content/plugins/infinite-scroll
diff --git a/content/jetpack b/content/plugins/jetpack
similarity index 100%
rename from content/jetpack
rename to content/plugins/jetpack
diff --git a/index.php b/index.php
index 05c06f9..bb5198b 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
 <?php
 // WordPress view bootstrapper
 define( 'WP_USE_THEMES', true );
-require( './wp/wp-blog-header.php' );
+require( './wordpress/wp-blog-header.php' );
diff --git a/wordpress b/wordpress
new file mode 160000
index 0000000..f30266a
--- /dev/null
+++ b/wordpress
@@ -0,0 +1 @@
+Subproject commit f30266acb9ff9ef30dfe14ae64ef165039980835
diff --git a/wp b/wp
deleted file mode 160000
index 8422210..0000000
--- a/wp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 842221094a5011886291b21fd7c705835d69e0bc
diff --git a/wp-config.php b/wp-config.php
index cd9652b..efaa42d 100644
--- a/wp-config.php
+++ b/wp-config.php
@@ -79,5 +79,5 @@ define( 'STAGING_DOMAIN', '%%WP_STAGING_DOMAIN%%' ); // Does magic in WP Stack t
 // Bootstrap WordPress
 // ===================
 if ( !defined( 'ABSPATH' ) )
-	define( 'ABSPATH', dirname( __FILE__ ) . '/wp/' );
+	define( 'ABSPATH', dirname( __FILE__ ) . '/wordpress/' );
 require_once( ABSPATH . 'wp-settings.php' );