Merge pull request #36 from dstufft/shuffle-directories

Move nacl into the src directory

setup.py

@@ -11,11 +11,6 @@ from distutils.command.build_clib import build_clib as _build_clib
 
 from setuptools import setup
 
-import nacl
-
-
-SODIUM_VERSION = "0.4.3"
-
 
 def here(*paths):
     return os.path.abspath(os.path.join(os.path.dirname(__file__), *paths))
@@ -23,6 +18,15 @@ def here(*paths):
 sodium = functools.partial(here, "src/libsodium/src/libsodium")
 
 
+sys.path.append(here("src"))
+
+
+import nacl
+
+
+SODIUM_VERSION = "0.4.3"
+
+
 def which(name, flags=os.X_OK):  # Taken from twisted
     result = []
     exts = filter(None, os.environ.get('PATHEXT', '').split(os.pathsep))
@@ -173,6 +177,7 @@ setup(
     },
     tests_require=["pytest"],
 
+    package_dir={"": "src"},
     packages=[
         "nacl",
     ],