diff --git a/newbinding/Makefile b/llvmpy/Makefile
similarity index 100%
rename from newbinding/Makefile
rename to llvmpy/Makefile
diff --git a/newbinding/README b/llvmpy/README
similarity index 100%
rename from newbinding/README
rename to llvmpy/README
diff --git a/llvmpy/__init__.py b/llvmpy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/newbinding/capsule.cpp b/llvmpy/capsule.cpp
similarity index 100%
rename from newbinding/capsule.cpp
rename to llvmpy/capsule.cpp
diff --git a/newbinding/capsule.py b/llvmpy/capsule.py
similarity index 100%
rename from newbinding/capsule.py
rename to llvmpy/capsule.py
diff --git a/newbinding/extra.py b/llvmpy/extra.py
similarity index 89%
rename from newbinding/extra.py
rename to llvmpy/extra.py
index d65f84c..a2e744f 100644
--- a/newbinding/extra.py
+++ b/llvmpy/extra.py
@@ -2,8 +2,8 @@
 Wrapped the extra functions in _api.so
 '''
 
-import capsule
-import _api
+from llvmpy import capsule
+from llvmpy import _api
 #
 # Re-export the native API from the _api.extra and wrap the functions
 #
diff --git a/newbinding/gen/binding.py b/llvmpy/gen/binding.py
similarity index 99%
rename from newbinding/gen/binding.py
rename to llvmpy/gen/binding.py
index cfe4394..6d73cd3 100644
--- a/newbinding/gen/binding.py
+++ b/llvmpy/gen/binding.py
@@ -135,7 +135,7 @@ class SubModule(object):
             filepath = os.path.join(rootdir, '%s.py' % name)
         with open(filepath, 'w') as pyfile:
             println = cg.wrap_println_from_file(pyfile)
-            println('import _api, capsule')
+            println('from llvmpy import _api, capsule')
             for ns in self.namespaces:
                 println('from . import %s' % ns.localname)
             println()
diff --git a/newbinding/gen/codegen.py b/llvmpy/gen/codegen.py
similarity index 100%
rename from newbinding/gen/codegen.py
rename to llvmpy/gen/codegen.py
diff --git a/newbinding/gen/gen.py b/llvmpy/gen/gen.py
similarity index 100%
rename from newbinding/gen/gen.py
rename to llvmpy/gen/gen.py
diff --git a/newbinding/include/llvm_binding/auto_pyobject.h b/llvmpy/include/llvm_binding/auto_pyobject.h
similarity index 100%
rename from newbinding/include/llvm_binding/auto_pyobject.h
rename to llvmpy/include/llvm_binding/auto_pyobject.h
diff --git a/newbinding/include/llvm_binding/binding.h b/llvmpy/include/llvm_binding/binding.h
similarity index 100%
rename from newbinding/include/llvm_binding/binding.h
rename to llvmpy/include/llvm_binding/binding.h
diff --git a/newbinding/include/llvm_binding/capsule_context.h b/llvmpy/include/llvm_binding/capsule_context.h
similarity index 100%
rename from newbinding/include/llvm_binding/capsule_context.h
rename to llvmpy/include/llvm_binding/capsule_context.h
diff --git a/newbinding/include/llvm_binding/conversion.h b/llvmpy/include/llvm_binding/conversion.h
similarity index 100%
rename from newbinding/include/llvm_binding/conversion.h
rename to llvmpy/include/llvm_binding/conversion.h
diff --git a/newbinding/include/llvm_binding/extra.h b/llvmpy/include/llvm_binding/extra.h
similarity index 99%
rename from newbinding/include/llvm_binding/extra.h
rename to llvmpy/include/llvm_binding/extra.h
index d045d5c..438f52c 100644
--- a/newbinding/include/llvm_binding/extra.h
+++ b/llvmpy/include/llvm_binding/extra.h
@@ -358,6 +358,7 @@ PyObject* ExecutionEngine_RunFunction(llvm::ExecutionEngine* EE,
         return NULL;
     }
     std::vector<GenericValue> vec_args;
+
     Py_ssize_t nargs = PyTuple_Size(Args);
     vec_args.reserve(nargs);
     for (Py_ssize_t i = 0; i < nargs; ++i) {
diff --git a/newbinding/setup.py b/llvmpy/setup.py
similarity index 100%
rename from newbinding/setup.py
rename to llvmpy/setup.py
diff --git a/newbinding/src/ADT/SmallVector.py b/llvmpy/src/ADT/SmallVector.py
similarity index 100%
rename from newbinding/src/ADT/SmallVector.py
rename to llvmpy/src/ADT/SmallVector.py
diff --git a/newbinding/src/ADT/StringRef.py b/llvmpy/src/ADT/StringRef.py
similarity index 100%
rename from newbinding/src/ADT/StringRef.py
rename to llvmpy/src/ADT/StringRef.py
diff --git a/newbinding/src/ADT/Triple.py b/llvmpy/src/ADT/Triple.py
similarity index 100%
rename from newbinding/src/ADT/Triple.py
rename to llvmpy/src/ADT/Triple.py
diff --git a/newbinding/src/ADT/__init__.py b/llvmpy/src/ADT/__init__.py
similarity index 100%
rename from newbinding/src/ADT/__init__.py
rename to llvmpy/src/ADT/__init__.py
diff --git a/newbinding/src/Analysis/Verifier.py b/llvmpy/src/Analysis/Verifier.py
similarity index 100%
rename from newbinding/src/Analysis/Verifier.py
rename to llvmpy/src/Analysis/Verifier.py
diff --git a/newbinding/src/Analysis/__init__.py b/llvmpy/src/Analysis/__init__.py
similarity index 100%
rename from newbinding/src/Analysis/__init__.py
rename to llvmpy/src/Analysis/__init__.py
diff --git a/newbinding/src/Argument.py b/llvmpy/src/Argument.py
similarity index 100%
rename from newbinding/src/Argument.py
rename to llvmpy/src/Argument.py
diff --git a/newbinding/src/Assembly/AssemblyAnnotationWriter.py b/llvmpy/src/Assembly/AssemblyAnnotationWriter.py
similarity index 100%
rename from newbinding/src/Assembly/AssemblyAnnotationWriter.py
rename to llvmpy/src/Assembly/AssemblyAnnotationWriter.py
diff --git a/newbinding/src/Assembly/Parser.py b/llvmpy/src/Assembly/Parser.py
similarity index 100%
rename from newbinding/src/Assembly/Parser.py
rename to llvmpy/src/Assembly/Parser.py
diff --git a/newbinding/src/Assembly/__init__.py b/llvmpy/src/Assembly/__init__.py
similarity index 100%
rename from newbinding/src/Assembly/__init__.py
rename to llvmpy/src/Assembly/__init__.py
diff --git a/newbinding/src/Attributes.py b/llvmpy/src/Attributes.py
similarity index 100%
rename from newbinding/src/Attributes.py
rename to llvmpy/src/Attributes.py
diff --git a/newbinding/src/BasicBlock.py b/llvmpy/src/BasicBlock.py
similarity index 100%
rename from newbinding/src/BasicBlock.py
rename to llvmpy/src/BasicBlock.py
diff --git a/newbinding/src/Bitcode/ReaderWriter.py b/llvmpy/src/Bitcode/ReaderWriter.py
similarity index 100%
rename from newbinding/src/Bitcode/ReaderWriter.py
rename to llvmpy/src/Bitcode/ReaderWriter.py
diff --git a/newbinding/src/Bitcode/__init__.py b/llvmpy/src/Bitcode/__init__.py
similarity index 100%
rename from newbinding/src/Bitcode/__init__.py
rename to llvmpy/src/Bitcode/__init__.py
diff --git a/newbinding/src/CallingConv.py b/llvmpy/src/CallingConv.py
similarity index 100%
rename from newbinding/src/CallingConv.py
rename to llvmpy/src/CallingConv.py
diff --git a/newbinding/src/CodeGen/MachineCodeInfo.py b/llvmpy/src/CodeGen/MachineCodeInfo.py
similarity index 100%
rename from newbinding/src/CodeGen/MachineCodeInfo.py
rename to llvmpy/src/CodeGen/MachineCodeInfo.py
diff --git a/newbinding/src/CodeGen/__init__.py b/llvmpy/src/CodeGen/__init__.py
similarity index 100%
rename from newbinding/src/CodeGen/__init__.py
rename to llvmpy/src/CodeGen/__init__.py
diff --git a/newbinding/src/Constant.py b/llvmpy/src/Constant.py
similarity index 98%
rename from newbinding/src/Constant.py
rename to llvmpy/src/Constant.py
index 42541c4..5407d71 100644
--- a/newbinding/src/Constant.py
+++ b/llvmpy/src/Constant.py
@@ -227,7 +227,7 @@ class ConstantExpr:
 
     @CustomPythonStaticMethod
     def getGetElementPtr(*args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         valuelist = args[1]
         args[1] = extra.make_small_vector_from_values(*valuelist)
@@ -242,7 +242,7 @@ class ConstantExpr:
 
     @CustomPythonStaticMethod
     def getExtractValue(*args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         valuelist = args[1]
         args[1] = extra.make_small_vector_from_unsigned(*valuelist)
@@ -254,7 +254,7 @@ class ConstantExpr:
 
     @CustomPythonStaticMethod
     def getInsertValue(*args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         valuelist = args[2]
         args[1] = extra.make_small_vector_from_unsigned(*valuelist)
diff --git a/newbinding/src/DataLayout.py b/llvmpy/src/DataLayout.py
similarity index 99%
rename from newbinding/src/DataLayout.py
rename to llvmpy/src/DataLayout.py
index 704c4b1..d704723 100644
--- a/newbinding/src/DataLayout.py
+++ b/llvmpy/src/DataLayout.py
@@ -81,7 +81,7 @@ class DataLayout:
 
     @CustomPythonMethod
     def getIndexedOffset(self, *args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         args[1] = extra.make_small_vector_from_values(args[1])
         return self.getIndexedOffset(*args)
diff --git a/newbinding/src/DerivedTypes.py b/llvmpy/src/DerivedTypes.py
similarity index 96%
rename from newbinding/src/DerivedTypes.py
rename to llvmpy/src/DerivedTypes.py
index e71f1a8..a34c2f1 100644
--- a/newbinding/src/DerivedTypes.py
+++ b/llvmpy/src/DerivedTypes.py
@@ -17,7 +17,7 @@ class FunctionType:
 
     @CustomPythonStaticMethod
     def get(*args):
-        import extra
+        from llvmpy import extra
         if len(args) == 3:
             typelist = args[1]
             sv = extra.make_small_vector_from_types(*typelist)
diff --git a/newbinding/src/EngineBuilder.py b/llvmpy/src/EngineBuilder.py
similarity index 100%
rename from newbinding/src/EngineBuilder.py
rename to llvmpy/src/EngineBuilder.py
diff --git a/newbinding/src/ExecutionEngine/ExecutionEngine.py b/llvmpy/src/ExecutionEngine/ExecutionEngine.py
similarity index 99%
rename from newbinding/src/ExecutionEngine/ExecutionEngine.py
rename to llvmpy/src/ExecutionEngine/ExecutionEngine.py
index f4bdb14..1188de3 100644
--- a/newbinding/src/ExecutionEngine/ExecutionEngine.py
+++ b/llvmpy/src/ExecutionEngine/ExecutionEngine.py
@@ -88,7 +88,7 @@ class ExecutionEngine:
 
     @CustomPythonMethod
     def runFunction(self, fn, args):
-        import capsule
+        from llvmpy import capsule
         unwrapped = map(capsule.unwrap, args)
         return self._runFunction(fn, tuple(unwrapped))
 
diff --git a/newbinding/src/ExecutionEngine/__init__.py b/llvmpy/src/ExecutionEngine/__init__.py
similarity index 100%
rename from newbinding/src/ExecutionEngine/__init__.py
rename to llvmpy/src/ExecutionEngine/__init__.py
diff --git a/newbinding/src/Function.py b/llvmpy/src/Function.py
similarity index 100%
rename from newbinding/src/Function.py
rename to llvmpy/src/Function.py
diff --git a/newbinding/src/GenericValue.py b/llvmpy/src/GenericValue.py
similarity index 100%
rename from newbinding/src/GenericValue.py
rename to llvmpy/src/GenericValue.py
diff --git a/newbinding/src/GlobalValue.py b/llvmpy/src/GlobalValue.py
similarity index 100%
rename from newbinding/src/GlobalValue.py
rename to llvmpy/src/GlobalValue.py
diff --git a/newbinding/src/GlobalVariable.py b/llvmpy/src/GlobalVariable.py
similarity index 100%
rename from newbinding/src/GlobalVariable.py
rename to llvmpy/src/GlobalVariable.py
diff --git a/newbinding/src/IRBuilder.py b/llvmpy/src/IRBuilder.py
similarity index 98%
rename from newbinding/src/IRBuilder.py
rename to llvmpy/src/IRBuilder.py
index 2965367..095122f 100644
--- a/newbinding/src/IRBuilder.py
+++ b/llvmpy/src/IRBuilder.py
@@ -68,7 +68,7 @@ class IRBuilder:
 
     @CustomPythonMethod
     def CreateInvoke(self, *args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         valuelist = args[3]
         args[3] = extra.make_small_vector_from_values(*valuelist)
@@ -181,7 +181,7 @@ class IRBuilder:
 
     @CustomPythonMethod
     def CreateGEP(self, *args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         valuelist = args[1]
         args[1] = extra.make_small_vector_from_values(*valuelist)
@@ -194,7 +194,7 @@ class IRBuilder:
 
     @CustomPythonMethod
     def CreateInBoundsGEP(self, *args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         valuelist = args[1]
         args[1] = extra.make_small_vector_from_values(*valuelist)
@@ -241,7 +241,7 @@ class IRBuilder:
 
     @CustomPythonMethod
     def CreateCall(self, *args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         valuelist = args[1]
         args[1] = extra.make_small_vector_from_values(*valuelist)
@@ -282,7 +282,7 @@ class IRBuilder:
 
     @CustomPythonMethod
     def CreateExtractValue(self, args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         valuelist = args[1]
         args[1] = extra.make_small_vector_from_unsigned(*valuelist)
@@ -295,7 +295,7 @@ class IRBuilder:
 
     @CustomPythonMethod
     def CreateInsertValue(self, args):
-        import extra
+        from llvmpy import extra
         args = list(args)
         valuelist = args[2]
         args[1] = extra.make_small_vector_from_unsigned(*valuelist)
diff --git a/newbinding/src/InlineAsm.py b/llvmpy/src/InlineAsm.py
similarity index 100%
rename from newbinding/src/InlineAsm.py
rename to llvmpy/src/InlineAsm.py
diff --git a/newbinding/src/Instruction.py b/llvmpy/src/Instruction.py
similarity index 100%
rename from newbinding/src/Instruction.py
rename to llvmpy/src/Instruction.py
diff --git a/newbinding/src/Intrinsics.py b/llvmpy/src/Intrinsics.py
similarity index 100%
rename from newbinding/src/Intrinsics.py
rename to llvmpy/src/Intrinsics.py
diff --git a/newbinding/src/JITMemoryManager.py b/llvmpy/src/JITMemoryManager.py
similarity index 100%
rename from newbinding/src/JITMemoryManager.py
rename to llvmpy/src/JITMemoryManager.py
diff --git a/newbinding/src/LLVMContext.py b/llvmpy/src/LLVMContext.py
similarity index 100%
rename from newbinding/src/LLVMContext.py
rename to llvmpy/src/LLVMContext.py
diff --git a/newbinding/src/Linker.py b/llvmpy/src/Linker.py
similarity index 100%
rename from newbinding/src/Linker.py
rename to llvmpy/src/Linker.py
diff --git a/newbinding/src/Metadata.py b/llvmpy/src/Metadata.py
similarity index 98%
rename from newbinding/src/Metadata.py
rename to llvmpy/src/Metadata.py
index 338cbbd..94088ca 100644
--- a/newbinding/src/Metadata.py
+++ b/llvmpy/src/Metadata.py
@@ -46,7 +46,7 @@ class NamedMDNode:
 
     @CustomPythonMethod
     def __str__(self):
-        import extra
+        from llvmpy import extra
         os = extra.make_raw_ostream_for_printing()
         self.print_(os, None)
         return os.str()
\ No newline at end of file
diff --git a/newbinding/src/Module.py b/llvmpy/src/Module.py
similarity index 98%
rename from newbinding/src/Module.py
rename to llvmpy/src/Module.py
index 7718cd6..d68be36 100644
--- a/newbinding/src/Module.py
+++ b/llvmpy/src/Module.py
@@ -77,7 +77,7 @@ class Module:
 
     @CustomPythonMethod
     def __str__(self):
-        import extra
+        from llvmpy import extra
         os = extra.make_raw_ostream_for_printing()
         self.print_(os, None)
         return os.str()
diff --git a/newbinding/src/Pass.py b/llvmpy/src/Pass.py
similarity index 100%
rename from newbinding/src/Pass.py
rename to llvmpy/src/Pass.py
diff --git a/newbinding/src/PassManager.py b/llvmpy/src/PassManager.py
similarity index 100%
rename from newbinding/src/PassManager.py
rename to llvmpy/src/PassManager.py
diff --git a/newbinding/src/Support/CodeGen.py b/llvmpy/src/Support/CodeGen.py
similarity index 100%
rename from newbinding/src/Support/CodeGen.py
rename to llvmpy/src/Support/CodeGen.py
diff --git a/newbinding/src/Support/CommandLine.py b/llvmpy/src/Support/CommandLine.py
similarity index 100%
rename from newbinding/src/Support/CommandLine.py
rename to llvmpy/src/Support/CommandLine.py
diff --git a/newbinding/src/Support/DynamicLibrary.py b/llvmpy/src/Support/DynamicLibrary.py
similarity index 100%
rename from newbinding/src/Support/DynamicLibrary.py
rename to llvmpy/src/Support/DynamicLibrary.py
diff --git a/newbinding/src/Support/FormattedStream.py b/llvmpy/src/Support/FormattedStream.py
similarity index 100%
rename from newbinding/src/Support/FormattedStream.py
rename to llvmpy/src/Support/FormattedStream.py
diff --git a/newbinding/src/Support/SourceMgr.py b/llvmpy/src/Support/SourceMgr.py
similarity index 100%
rename from newbinding/src/Support/SourceMgr.py
rename to llvmpy/src/Support/SourceMgr.py
diff --git a/newbinding/src/Support/Target.py b/llvmpy/src/Support/Target.py
similarity index 100%
rename from newbinding/src/Support/Target.py
rename to llvmpy/src/Support/Target.py
diff --git a/newbinding/src/Support/TargetSelect.py b/llvmpy/src/Support/TargetSelect.py
similarity index 100%
rename from newbinding/src/Support/TargetSelect.py
rename to llvmpy/src/Support/TargetSelect.py
diff --git a/newbinding/src/Support/__init__.py b/llvmpy/src/Support/__init__.py
similarity index 100%
rename from newbinding/src/Support/__init__.py
rename to llvmpy/src/Support/__init__.py
diff --git a/newbinding/src/Support/raw_ostream.py b/llvmpy/src/Support/raw_ostream.py
similarity index 100%
rename from newbinding/src/Support/raw_ostream.py
rename to llvmpy/src/Support/raw_ostream.py
diff --git a/newbinding/src/Target/TargetLibraryInfo.py b/llvmpy/src/Target/TargetLibraryInfo.py
similarity index 100%
rename from newbinding/src/Target/TargetLibraryInfo.py
rename to llvmpy/src/Target/TargetLibraryInfo.py
diff --git a/newbinding/src/Target/TargetMachine.py b/llvmpy/src/Target/TargetMachine.py
similarity index 100%
rename from newbinding/src/Target/TargetMachine.py
rename to llvmpy/src/Target/TargetMachine.py
diff --git a/newbinding/src/Target/__init__.py b/llvmpy/src/Target/__init__.py
similarity index 100%
rename from newbinding/src/Target/__init__.py
rename to llvmpy/src/Target/__init__.py
diff --git a/newbinding/src/TargetTransformInfo.py b/llvmpy/src/TargetTransformInfo.py
similarity index 100%
rename from newbinding/src/TargetTransformInfo.py
rename to llvmpy/src/TargetTransformInfo.py
diff --git a/newbinding/src/Transforms/IPO.py b/llvmpy/src/Transforms/IPO.py
similarity index 100%
rename from newbinding/src/Transforms/IPO.py
rename to llvmpy/src/Transforms/IPO.py
diff --git a/newbinding/src/Transforms/PassManagerBuilder.py b/llvmpy/src/Transforms/PassManagerBuilder.py
similarity index 100%
rename from newbinding/src/Transforms/PassManagerBuilder.py
rename to llvmpy/src/Transforms/PassManagerBuilder.py
diff --git a/newbinding/src/Transforms/Utils/Cloning.py b/llvmpy/src/Transforms/Utils/Cloning.py
similarity index 100%
rename from newbinding/src/Transforms/Utils/Cloning.py
rename to llvmpy/src/Transforms/Utils/Cloning.py
diff --git a/newbinding/src/Transforms/Utils/__init__.py b/llvmpy/src/Transforms/Utils/__init__.py
similarity index 100%
rename from newbinding/src/Transforms/Utils/__init__.py
rename to llvmpy/src/Transforms/Utils/__init__.py
diff --git a/newbinding/src/Transforms/__init__.py b/llvmpy/src/Transforms/__init__.py
similarity index 100%
rename from newbinding/src/Transforms/__init__.py
rename to llvmpy/src/Transforms/__init__.py
diff --git a/newbinding/src/Type.py b/llvmpy/src/Type.py
similarity index 99%
rename from newbinding/src/Type.py
rename to llvmpy/src/Type.py
index 4078a9d..ec0bf88 100644
--- a/newbinding/src/Type.py
+++ b/llvmpy/src/Type.py
@@ -125,7 +125,7 @@ class Type:
 
     @CustomPythonMethod
     def __str__(self):
-        import extra
+        from llvmpy import extra
         os = extra.make_raw_ostream_for_printing()
         self.print_(os)
         return os.str()
diff --git a/newbinding/src/User.py b/llvmpy/src/User.py
similarity index 100%
rename from newbinding/src/User.py
rename to llvmpy/src/User.py
diff --git a/newbinding/src/Value.py b/llvmpy/src/Value.py
similarity index 98%
rename from newbinding/src/Value.py
rename to llvmpy/src/Value.py
index 27bcda0..88f221c 100644
--- a/newbinding/src/Value.py
+++ b/llvmpy/src/Value.py
@@ -56,7 +56,7 @@ class Value:
 
     @CustomPythonMethod
     def __str__(self):
-        import extra
+        from llvmpy import extra
         os = extra.make_raw_ostream_for_printing()
         self.print_(os, None)
         return os.str()
diff --git a/newbinding/src/__init__.py b/llvmpy/src/__init__.py
similarity index 100%
rename from newbinding/src/__init__.py
rename to llvmpy/src/__init__.py
diff --git a/newbinding/src/namespace.py b/llvmpy/src/namespace.py
similarity index 100%
rename from newbinding/src/namespace.py
rename to llvmpy/src/namespace.py
diff --git a/newbinding/test_binding.py b/llvmpy/test_binding.py
similarity index 98%
rename from newbinding/test_binding.py
rename to llvmpy/test_binding.py
index 7fa5e2c..e1e12e5 100644
--- a/newbinding/test_binding.py
+++ b/llvmpy/test_binding.py
@@ -1,8 +1,11 @@
-from api import llvm
-import extra
-import _capsule
 from StringIO import StringIO
-llvm.capsule.set_debug(True)
+
+from llvmpy.api import llvm
+from llvmpy import extra
+from llvmpy import _capsule
+import llvmpy.capsule
+llvmpy.capsule.set_debug(True)
+
 
 def test_basic_jit_use():
     llvm.InitializeNativeTarget()