8 files changed, 18 insertions, 29 deletions
diff --git a/git/db/cmd/__init__.py b/git/db/cmd/__init__.py
index 8b137891..968d8c11 100644
--- a/git/db/cmd/__init__.py
+++ b/git/db/cmd/__init__.py
@@ -1 +1,2 @@
 
+from complex import *
diff --git a/git/db/cmd/git.py b/git/db/cmd/complex.py
index 6c060f0e..73e2048f 100644
--- a/git/db/cmd/git.py
+++ b/git/db/cmd/complex.py
@@ -1,8 +1,8 @@
 """Module with our own git implementation - it uses the git command"""
-from exc import (
+from git.exc import (
 					GitCommandError, 
 					BadObject
-				)
+					)
 
 from git.base import (
 								OInfo,
@@ -13,10 +13,7 @@ from git.util import (
 							bin_to_hex, 
 							hex_to_bin
 						)
-from git.db.py import (
-						PureGitDB,
-						PureLooseObjectODB
-					)
+from git.db.py.loose import PureLooseObjectODB
 from git.util import RemoteProgress
 from git.db.py.base import TransportDB
 from git.db.interface import FetchInfo as GitdbFetchInfo
@@ -25,18 +22,18 @@ from git.db.interface import PushInfo as GitdbPushInfo
 from git.util import  join_path
 from git.util import join
 
-from refs import (
-					Reference,
-					RemoteReference,
-					SymbolicReference, 
-					TagReference
-				)
+from git.refs import (
+						Reference,
+						RemoteReference,
+						SymbolicReference, 
+						TagReference
+					)
 
 import re
 import sys
 
 
-__all__ = ('GitCmdObjectDB', 'PureGitDB', 'RemoteProgress' )
+__all__ = ('CmdGitDB', 'RemoteProgress' )
 
 
 class PushInfo(GitdbPushInfo):
@@ -269,7 +266,7 @@ class FetchInfo(GitdbFetchInfo):
 		return cls(remote_local_ref, flags, note, old_commit_binsha)
 		
 
-class GitCmdObjectDB(PureLooseObjectODB, TransportDB):
+class CmdGitDB(PureLooseObjectODB, TransportDB):
 	"""A database representing the default git object store, which includes loose 
 	objects, pack files and an alternates file
 	
@@ -279,7 +276,7 @@ class GitCmdObjectDB(PureLooseObjectODB, TransportDB):
 	"""
 	def __init__(self, root_path, git):
 		"""Initialize this instance with the root and a git command"""
-		super(GitCmdObjectDB, self).__init__(root_path)
+		super(CmdGitDB, self).__init__(root_path)
 		self._git = git
 
 	@classmethod
diff --git a/git/db/py/__init__.py b/git/db/py/__init__.py
index 046c699d..73cc2bdf 100644
--- a/git/db/py/__init__.py
+++ b/git/db/py/__init__.py
@@ -3,11 +3,4 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from base import *
-from loose import *
-from mem import *
-from pack import *
-from git import *
-from ref import *
-from resolve import *
-from transport import *
+from complex import *
diff --git a/git/db/py/base.py b/git/db/py/base.py
index 28bbf258..5c470ba4 100644
--- a/git/db/py/base.py
+++ b/git/db/py/base.py
@@ -3,7 +3,6 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Contains basic implementations for the interface building blocks"""
-
 from git.db.interface import *
 
 from git.util import (
diff --git a/git/db/py/git.py b/git/db/py/complex.py
index 1f929e31..1f929e31 100644
--- a/git/db/py/git.py
+++ b/git/db/py/complex.py
diff --git a/git/db/py/mem.py b/git/db/py/mem.py
index 5851aebc..da02dbdd 100644
--- a/git/db/py/mem.py
+++ b/git/db/py/mem.py
@@ -3,12 +3,11 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Contains the MemoryDatabase implementation"""
-from loose import PureLooseObjectODB
 from base import (
 						PureObjectDBR, 
 						PureObjectDBW
 					)
-
+from loose import PureLooseObjectODB
 from git.base import (
 							OStream,
 							IStream,
diff --git a/git/db/py/ref.py b/git/db/py/ref.py
index 951f0437..94887fb8 100644
--- a/git/db/py/ref.py
+++ b/git/db/py/ref.py
@@ -31,7 +31,7 @@ class PureReferenceDB(PureCompoundDB):
 		dbcls = self.ObjectDBCls
 		if dbcls is None:
 			# late import
-			from git import PureGitODB
+			from complex import PureGitODB	# TODO: This should be a configurable for flexibility
 			dbcls = PureGitODB
 		# END get db type
 		
diff --git a/git/db/py/resolve.py b/git/db/py/resolve.py
index 7c03bcd1..9cce8efe 100644
--- a/git/db/py/resolve.py
+++ b/git/db/py/resolve.py
@@ -3,8 +3,8 @@ version assuming compatible interface for reference and object types"""
 
 from git.db.interface import ReferencesMixin
 from git.exc import BadObject
-from git.ref import SymbolicReference
-from git.object.base import Object
+from git.refs import SymbolicReference
+from git.objects.base import Object
 from git.util import (
 							join,
 							isdir,