diff --git a/Makefile b/Makefile
index 1ecda3e8e6e..e228c1e9f65 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ tests:
 	PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v
 
 newtests:
-	PYTHONPATH=./lib/v2/ $(NOSETESTS) -d -w lib/v2/tests -v
+	PYTHONPATH=./v2/ $(NOSETESTS) -d -w v2/tests -v
 
 
 authors:
diff --git a/lib/v2/__init__.py b/v2/__init__.py
similarity index 100%
rename from lib/v2/__init__.py
rename to v2/__init__.py
diff --git a/lib/v2/ansible/anisble/config/__init__.py b/v2/ansible/anisble/config/__init__.py
similarity index 100%
rename from lib/v2/ansible/anisble/config/__init__.py
rename to v2/ansible/anisble/config/__init__.py
diff --git a/lib/v2/ansible/anisble/errors/__init__.py b/v2/ansible/anisble/errors/__init__.py
similarity index 100%
rename from lib/v2/ansible/anisble/errors/__init__.py
rename to v2/ansible/anisble/errors/__init__.py
diff --git a/lib/v2/ansible/inventory/__init__.py b/v2/ansible/inventory/__init__.py
similarity index 100%
rename from lib/v2/ansible/inventory/__init__.py
rename to v2/ansible/inventory/__init__.py
diff --git a/lib/v2/ansible/inventory/group.py b/v2/ansible/inventory/group.py
similarity index 100%
rename from lib/v2/ansible/inventory/group.py
rename to v2/ansible/inventory/group.py
diff --git a/lib/v2/ansible/inventory/host.py b/v2/ansible/inventory/host.py
similarity index 100%
rename from lib/v2/ansible/inventory/host.py
rename to v2/ansible/inventory/host.py
diff --git a/lib/v2/ansible/inventory/loaders/__init__.py b/v2/ansible/inventory/loaders/__init__.py
similarity index 100%
rename from lib/v2/ansible/inventory/loaders/__init__.py
rename to v2/ansible/inventory/loaders/__init__.py
diff --git a/lib/v2/ansible/inventory/loaders/dir.py b/v2/ansible/inventory/loaders/dir.py
similarity index 100%
rename from lib/v2/ansible/inventory/loaders/dir.py
rename to v2/ansible/inventory/loaders/dir.py
diff --git a/lib/v2/ansible/inventory/loaders/ini.py b/v2/ansible/inventory/loaders/ini.py
similarity index 100%
rename from lib/v2/ansible/inventory/loaders/ini.py
rename to v2/ansible/inventory/loaders/ini.py
diff --git a/lib/v2/ansible/inventory/loaders/script.py b/v2/ansible/inventory/loaders/script.py
similarity index 100%
rename from lib/v2/ansible/inventory/loaders/script.py
rename to v2/ansible/inventory/loaders/script.py
diff --git a/lib/v2/ansible/inventory/pattern.py b/v2/ansible/inventory/pattern.py
similarity index 100%
rename from lib/v2/ansible/inventory/pattern.py
rename to v2/ansible/inventory/pattern.py
diff --git a/lib/v2/ansible/playbook/__init__.py b/v2/ansible/playbook/__init__.py
similarity index 100%
rename from lib/v2/ansible/playbook/__init__.py
rename to v2/ansible/playbook/__init__.py
diff --git a/lib/v2/ansible/playbook/base.py b/v2/ansible/playbook/base.py
similarity index 100%
rename from lib/v2/ansible/playbook/base.py
rename to v2/ansible/playbook/base.py
diff --git a/lib/v2/ansible/playbook/block.py b/v2/ansible/playbook/block.py
similarity index 100%
rename from lib/v2/ansible/playbook/block.py
rename to v2/ansible/playbook/block.py
diff --git a/lib/v2/ansible/playbook/conditional.py b/v2/ansible/playbook/conditional.py
similarity index 100%
rename from lib/v2/ansible/playbook/conditional.py
rename to v2/ansible/playbook/conditional.py
diff --git a/lib/v2/ansible/playbook/handler.py b/v2/ansible/playbook/handler.py
similarity index 100%
rename from lib/v2/ansible/playbook/handler.py
rename to v2/ansible/playbook/handler.py
diff --git a/lib/v2/ansible/playbook/include.py b/v2/ansible/playbook/include.py
similarity index 100%
rename from lib/v2/ansible/playbook/include.py
rename to v2/ansible/playbook/include.py
diff --git a/lib/v2/ansible/playbook/play.py b/v2/ansible/playbook/play.py
similarity index 100%
rename from lib/v2/ansible/playbook/play.py
rename to v2/ansible/playbook/play.py
diff --git a/lib/v2/ansible/playbook/playbook_include.py b/v2/ansible/playbook/playbook_include.py
similarity index 100%
rename from lib/v2/ansible/playbook/playbook_include.py
rename to v2/ansible/playbook/playbook_include.py
diff --git a/lib/v2/ansible/playbook/role.py b/v2/ansible/playbook/role.py
similarity index 100%
rename from lib/v2/ansible/playbook/role.py
rename to v2/ansible/playbook/role.py
diff --git a/lib/v2/ansible/playbook/tag.py b/v2/ansible/playbook/tag.py
similarity index 100%
rename from lib/v2/ansible/playbook/tag.py
rename to v2/ansible/playbook/tag.py
diff --git a/lib/v2/ansible/playbook/task.py b/v2/ansible/playbook/task.py
similarity index 100%
rename from lib/v2/ansible/playbook/task.py
rename to v2/ansible/playbook/task.py
diff --git a/lib/v2/ansible/playbook/task_include.py b/v2/ansible/playbook/task_include.py
similarity index 100%
rename from lib/v2/ansible/playbook/task_include.py
rename to v2/ansible/playbook/task_include.py
diff --git a/lib/v2/ansible/playbook/vars.py b/v2/ansible/playbook/vars.py
similarity index 100%
rename from lib/v2/ansible/playbook/vars.py
rename to v2/ansible/playbook/vars.py
diff --git a/lib/v2/ansible/playbook/vars_file.py b/v2/ansible/playbook/vars_file.py
similarity index 100%
rename from lib/v2/ansible/playbook/vars_file.py
rename to v2/ansible/playbook/vars_file.py
diff --git a/lib/v2/ansible/plugins/__init__.py b/v2/ansible/plugins/__init__.py
similarity index 100%
rename from lib/v2/ansible/plugins/__init__.py
rename to v2/ansible/plugins/__init__.py
diff --git a/lib/v2/ansible/plugins/action/__init__.py b/v2/ansible/plugins/action/__init__.py
similarity index 100%
rename from lib/v2/ansible/plugins/action/__init__.py
rename to v2/ansible/plugins/action/__init__.py
diff --git a/lib/v2/ansible/plugins/callback/__init__.py b/v2/ansible/plugins/callback/__init__.py
similarity index 100%
rename from lib/v2/ansible/plugins/callback/__init__.py
rename to v2/ansible/plugins/callback/__init__.py
diff --git a/lib/v2/ansible/plugins/connections/__init__.py b/v2/ansible/plugins/connections/__init__.py
similarity index 100%
rename from lib/v2/ansible/plugins/connections/__init__.py
rename to v2/ansible/plugins/connections/__init__.py
diff --git a/lib/v2/ansible/plugins/filter/__init__.py b/v2/ansible/plugins/filter/__init__.py
similarity index 100%
rename from lib/v2/ansible/plugins/filter/__init__.py
rename to v2/ansible/plugins/filter/__init__.py
diff --git a/lib/v2/ansible/plugins/inventory/__init__.py b/v2/ansible/plugins/inventory/__init__.py
similarity index 100%
rename from lib/v2/ansible/plugins/inventory/__init__.py
rename to v2/ansible/plugins/inventory/__init__.py
diff --git a/lib/v2/ansible/plugins/lookup/__init__.py b/v2/ansible/plugins/lookup/__init__.py
similarity index 100%
rename from lib/v2/ansible/plugins/lookup/__init__.py
rename to v2/ansible/plugins/lookup/__init__.py
diff --git a/lib/v2/ansible/plugins/shell/__init__.py b/v2/ansible/plugins/shell/__init__.py
similarity index 100%
rename from lib/v2/ansible/plugins/shell/__init__.py
rename to v2/ansible/plugins/shell/__init__.py
diff --git a/lib/v2/ansible/plugins/vars/__init__.py b/v2/ansible/plugins/vars/__init__.py
similarity index 100%
rename from lib/v2/ansible/plugins/vars/__init__.py
rename to v2/ansible/plugins/vars/__init__.py
diff --git a/lib/v2/ansible/runner/__init__.py b/v2/ansible/runner/__init__.py
similarity index 100%
rename from lib/v2/ansible/runner/__init__.py
rename to v2/ansible/runner/__init__.py