diff --git a/.gitmodules b/.gitmodules
index e69de29bb2..793522a29c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "lib/ansible/modules/core"]
+	path = lib/ansible/modules/core
+	url = https://github.com/ansible/ansible-modules-core
+[submodule "lib/ansible/modules/extras"]
+	path = lib/ansible/modules/extras
+	url = https://github.com/ansible/ansible-modules-extras
+[submodule "v1/ansible/modules/core"]
+	path = v1/ansible/modules/core
+	url = https://github.com/ansible/ansible-modules-core
+[submodule "v1/ansible/modules/extras"]
+	path = v1/ansible/modules/extras
+	url = https://github.com/ansible/ansible-modules-extras
diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py
index 8637adb54d..704b6456f7 100644
--- a/lib/ansible/__init__.py
+++ b/lib/ansible/__init__.py
@@ -14,9 +14,5 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-__version__ = '2.0'
+__version__ = '2.0.0'
+__author__  = 'Ansible, Inc.'
diff --git a/lib/ansible/modules/core b/lib/ansible/modules/core
new file mode 160000
index 0000000000..0341ddd35e
--- /dev/null
+++ b/lib/ansible/modules/core
@@ -0,0 +1 @@
+Subproject commit 0341ddd35ed5ff477ad5de2488d947255ce86259
diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras
new file mode 160000
index 0000000000..495ad450e5
--- /dev/null
+++ b/lib/ansible/modules/extras
@@ -0,0 +1 @@
+Subproject commit 495ad450e53feb1cd26218dc68056cc34d1ea9ff
diff --git a/v1/ansible/modules/core b/v1/ansible/modules/core
new file mode 160000
index 0000000000..9028e9d4be
--- /dev/null
+++ b/v1/ansible/modules/core
@@ -0,0 +1 @@
+Subproject commit 9028e9d4be8a3dbb96c81a799e18f3adf63d9fd0
diff --git a/v1/ansible/modules/extras b/v1/ansible/modules/extras
new file mode 160000
index 0000000000..495ad450e5
--- /dev/null
+++ b/v1/ansible/modules/extras
@@ -0,0 +1 @@
+Subproject commit 495ad450e53feb1cd26218dc68056cc34d1ea9ff