diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f79555a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,15 @@
+[submodule "cookbooks/apt"]
+	path = cookbooks/apt
+	url = https://github.com/opscode-cookbooks/apt.git
+[submodule "cookbooks/build-essential"]
+	path = cookbooks/build-essential
+	url = https://github.com/opscode-cookbooks/build-essential.git
+[submodule "cookbooks/git"]
+	path = cookbooks/git
+	url = https://github.com/opscode-cookbooks/git.git
+[submodule "cookbooks/vim"]
+	path = cookbooks/vim
+	url = https://github.com/opscode-cookbooks/vim.git
+[submodule "cookbooks/java"]
+	path = cookbooks/java
+	url = https://github.com/opscode-cookbooks/java.git
diff --git a/README.md b/README.md
index 279449b..e82aa1b 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ _Note: All the software needed is automatically downloaded as it is needed.  Sev
 
 1. From the newly created working directory, e.g.
 
-		$ cd /csci65/android-vm
+		$ cd /csci65/android-vm && git submodule init
 
 2. Run the following to start Vagrant and kick-off the process to build an Android VM,
 	
diff --git a/cookbooks/apt b/cookbooks/apt
index b58c755..8ef28bc 160000
--- a/cookbooks/apt
+++ b/cookbooks/apt
@@ -1 +1 @@
-Subproject commit b58c75536300794e5b5ffa8747fc9e6c48a4e5ce
+Subproject commit 8ef28bceaa6a9eded47e640d26df4a6f3a80320c
diff --git a/cookbooks/build-essential b/cookbooks/build-essential
index 7f4d351..9eea6e1 160000
--- a/cookbooks/build-essential
+++ b/cookbooks/build-essential
@@ -1 +1 @@
-Subproject commit 7f4d351036f10e7b641e1df137390491d6111669
+Subproject commit 9eea6e1486754c0a5e700d767a62bde7d69c3194
diff --git a/cookbooks/git b/cookbooks/git
index 575a3ee..fe2713e 160000
--- a/cookbooks/git
+++ b/cookbooks/git
@@ -1 +1 @@
-Subproject commit 575a3ee5f6cafa709033c3ac39484512ad028443
+Subproject commit fe2713e528096e5d22441fe53808c79ea77fd0b3
diff --git a/cookbooks/java b/cookbooks/java
index c6ef8a7..3258352 160000
--- a/cookbooks/java
+++ b/cookbooks/java
@@ -1 +1 @@
-Subproject commit c6ef8a7d938edff1c8ac5c1af24026575d32af8c
+Subproject commit 325835205d353be331cbf00f43fe10e8162cee37
diff --git a/cookbooks/vim b/cookbooks/vim
new file mode 160000
index 0000000..858a24f
--- /dev/null
+++ b/cookbooks/vim
@@ -0,0 +1 @@
+Subproject commit 858a24f745d3f7e13daca5ba918861d31401e0bf
diff --git a/cookbooks/vim/README.md b/cookbooks/vim/README.md
deleted file mode 100644
index 7186b12..0000000
--- a/cookbooks/vim/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-Description
-===========
-
-Installs vim.
-
-Requirements
-============
-
-## Platform:
-
-* Ubuntu/Debian
-* Red Hat/CentOS/Fedora/Scientific
-* ArchLinux
-
-Attributes
-==========
-
-* `node[:vim][:extra_packages]` - An array of extra packages related to vim to install (like plugins). Empty array by default.
-
-Usage
-=====
-
-Put `recipe[vim]` in a run list, or `include_recipe 'vim'` to ensure that vim is installed on your systems.
-
-If you would like to install additional vim plugin packages, include their package names in the `node[:vim][:extra_packages]` attribute. Verify that your operating sytem has the package available.
-
-Changes
-=======
-
-## v1.0.2:
-
-* Fixes COOK-598 (RHEL platforms support).
-
-License and Author
-==================
-
-Author:: Joshua Timberman <joshua@opscode.com>
-
-Copyright 2010, Opscode, Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
diff --git a/cookbooks/vim/attributes/default.rb b/cookbooks/vim/attributes/default.rb
deleted file mode 100644
index 08e9e47..0000000
--- a/cookbooks/vim/attributes/default.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Cookbook Name:: vim
-# Attributes:: default
-#
-# Copyright 2010, Opscode, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-default[:vim][:extra_packages] = []
diff --git a/cookbooks/vim/metadata.json b/cookbooks/vim/metadata.json
deleted file mode 100644
index f743602..0000000
--- a/cookbooks/vim/metadata.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "vim",
-  "description": "Installs vim and optional extra packages.",
-  "long_description": "Description\n===========\n\nInstalls vim.\n\nRequirements\n============\n\n## Platform:\n\n* Ubuntu/Debian\n* Red Hat/CentOS/Fedora/Scientific\n* ArchLinux\n\nAttributes\n==========\n\n* `node[:vim][:extra_packages]` - An array of extra packages related to vim to install (like plugins). Empty array by default.\n\nUsage\n=====\n\nPut `recipe[vim]` in a run list, or `include_recipe 'vim'` to ensure that vim is installed on your systems.\n\nIf you would like to install additional vim plugin packages, include their package names in the `node[:vim][:extra_packages]` attribute. Verify that your operating sytem has the package available.\n\nChanges\n=======\n\n## v1.0.2:\n\n* Fixes COOK-598 (RHEL platforms support).\n\nLicense and Author\n==================\n\nAuthor:: Joshua Timberman <joshua@opscode.com>\n\nCopyright 2010, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\n",
-  "maintainer": "Opscode, Inc.",
-  "maintainer_email": "cookbooks@opscode.com",
-  "license": "Apache 2.0",
-  "platforms": {
-    "debian": ">= 0.0.0",
-    "ubuntu": ">= 0.0.0",
-    "arch": ">= 0.0.0",
-    "redhat": ">= 0.0.0",
-    "centos": ">= 0.0.0",
-    "fedora": ">= 0.0.0",
-    "scientific": ">= 0.0.0"
-  },
-  "dependencies": {
-  },
-  "recommendations": {
-  },
-  "suggestions": {
-  },
-  "conflicting": {
-  },
-  "providing": {
-  },
-  "replacing": {
-  },
-  "attributes": {
-  },
-  "groupings": {
-  },
-  "recipes": {
-  },
-  "version": "1.0.2"
-}
\ No newline at end of file
diff --git a/cookbooks/vim/metadata.rb b/cookbooks/vim/metadata.rb
deleted file mode 100644
index 25f185d..0000000
--- a/cookbooks/vim/metadata.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-maintainer       "Opscode, Inc."
-maintainer_email "cookbooks@opscode.com"
-license          "Apache 2.0"
-description      "Installs vim and optional extra packages."
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "1.0.2"
-
-%w{debian ubuntu arch redhat centos fedora scientific}.each do |os|
-  supports os
-end
-
diff --git a/cookbooks/vim/recipes/default.rb b/cookbooks/vim/recipes/default.rb
deleted file mode 100644
index cb5f1a2..0000000
--- a/cookbooks/vim/recipes/default.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Cookbook Name:: vim
-# Recipe:: default
-#
-# Copyright 2010, Opscode, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# There is no vim package on RHEL/CentOS derivatives
-# * vim-minimal gives you /bin/vi
-# * vim-enhanced gives you /usr/bin/vim
-vim_base_pkgs = value_for_platform(
-  ["ubuntu", "debian", "arch"] => { "default" => ["vim"] },
-  ["redhat", "centos", "fedora", "scientific"] => { "default" => ["vim-minimal","vim-enhanced"] },
-  "default" => ["vim"]
-)
-
-vim_base_pkgs.each do |vim_base_pkg|
-  package vim_base_pkg
-end
-
-node[:vim][:extra_packages].each do |vimpkg|
-  package vimpkg
-end