diff --git a/github/GithubObjects/ObjectCapacities/ArgumentsChecker.py b/github/GithubObjects/GithubObject/ArgumentsChecker.py
similarity index 100%
rename from github/GithubObjects/ObjectCapacities/ArgumentsChecker.py
rename to github/GithubObjects/GithubObject/ArgumentsChecker.py
diff --git a/github/GithubObjects/ObjectCapacities/Basic.py b/github/GithubObjects/GithubObject/Basic.py
similarity index 100%
rename from github/GithubObjects/ObjectCapacities/Basic.py
rename to github/GithubObjects/GithubObject/Basic.py
diff --git a/github/GithubObjects/GithubObject.UnitTest.py b/github/GithubObjects/GithubObject/GithubObject.UnitTest.py
similarity index 100%
rename from github/GithubObjects/GithubObject.UnitTest.py
rename to github/GithubObjects/GithubObject/GithubObject.UnitTest.py
diff --git a/github/GithubObjects/GithubObject.py b/github/GithubObjects/GithubObject/GithubObject.py
similarity index 96%
rename from github/GithubObjects/GithubObject.py
rename to github/GithubObjects/GithubObject/GithubObject.py
index 00d61745..023509b9 100644
--- a/github/GithubObjects/GithubObject.py
+++ b/github/GithubObjects/GithubObject/GithubObject.py
@@ -1,9 +1,9 @@
 import itertools
 
-from ObjectCapacities.ArgumentsChecker import *
-from ObjectCapacities.Basic import *
-from ObjectCapacities.List import *
-from ObjectCapacities.TypePolicies import *
+from ArgumentsChecker import *
+from Basic import *
+from List import *
+from TypePolicies import *
 
 class BadGithubObjectException( Exception ):
     pass
diff --git a/github/GithubObjects/ObjectCapacities/List.py b/github/GithubObjects/GithubObject/List.py
similarity index 100%
rename from github/GithubObjects/ObjectCapacities/List.py
rename to github/GithubObjects/GithubObject/List.py
diff --git a/github/GithubObjects/ObjectCapacities/TypePolicies.py b/github/GithubObjects/GithubObject/TypePolicies.py
similarity index 100%
rename from github/GithubObjects/ObjectCapacities/TypePolicies.py
rename to github/GithubObjects/GithubObject/TypePolicies.py
diff --git a/github/GithubObjects/GithubObject/__init__.py b/github/GithubObjects/GithubObject/__init__.py
new file mode 100644
index 00000000..cbc7e4d6
--- /dev/null
+++ b/github/GithubObjects/GithubObject/__init__.py
@@ -0,0 +1 @@
+from GithubObject import *
diff --git a/github/GithubObjects/ObjectCapacities/__init__.py b/github/GithubObjects/ObjectCapacities/__init__.py
deleted file mode 100644
index e69de29b..00000000