diff --git a/test_evm/__init__.py b/oyente/__init__.py
similarity index 100%
rename from test_evm/__init__.py
rename to oyente/__init__.py
diff --git a/analysis.py b/oyente/analysis.py
similarity index 100%
rename from analysis.py
rename to oyente/analysis.py
diff --git a/arithmetic_utils.py b/oyente/arithmetic_utils.py
similarity index 100%
rename from arithmetic_utils.py
rename to oyente/arithmetic_utils.py
diff --git a/basicblock.py b/oyente/basicblock.py
similarity index 100%
rename from basicblock.py
rename to oyente/basicblock.py
diff --git a/batch_run.py b/oyente/batch_run.py
similarity index 100%
rename from batch_run.py
rename to oyente/batch_run.py
diff --git a/ethereum_data.py b/oyente/ethereum_data.py
similarity index 100%
rename from ethereum_data.py
rename to oyente/ethereum_data.py
diff --git a/ethereum_data1.py b/oyente/ethereum_data1.py
similarity index 100%
rename from ethereum_data1.py
rename to oyente/ethereum_data1.py
diff --git a/global_params.py b/oyente/global_params.py
similarity index 100%
rename from global_params.py
rename to oyente/global_params.py
diff --git a/opcodes.py b/oyente/opcodes.py
similarity index 100%
rename from opcodes.py
rename to oyente/opcodes.py
diff --git a/oyente.py b/oyente/oyente.py
similarity index 99%
rename from oyente.py
rename to oyente/oyente.py
index 3808aa52..59d8dfcd 100755
--- a/oyente.py
+++ b/oyente/oyente.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 import shlex
 import subprocess
 import os
diff --git a/state.json b/oyente/state.json
similarity index 100%
rename from state.json
rename to oyente/state.json
diff --git a/symExec.py b/oyente/symExec.py
similarity index 100%
rename from symExec.py
rename to oyente/symExec.py
diff --git a/test_evm.py b/oyente/test_evm.py
similarity index 100%
rename from test_evm.py
rename to oyente/test_evm.py
diff --git a/oyente/test_evm/__init__.py b/oyente/test_evm/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/test_evm/evm_unit_test.py b/oyente/test_evm/evm_unit_test.py
similarity index 100%
rename from test_evm/evm_unit_test.py
rename to oyente/test_evm/evm_unit_test.py
diff --git a/test_evm/global_test_params.py b/oyente/test_evm/global_test_params.py
similarity index 100%
rename from test_evm/global_test_params.py
rename to oyente/test_evm/global_test_params.py
diff --git a/test_evm/test_data/vmArithmeticTest.json b/oyente/test_evm/test_data/vmArithmeticTest.json
similarity index 100%
rename from test_evm/test_data/vmArithmeticTest.json
rename to oyente/test_evm/test_data/vmArithmeticTest.json
diff --git a/test_evm/test_data/vmBitwiseLogicOperationTest.json b/oyente/test_evm/test_data/vmBitwiseLogicOperationTest.json
similarity index 100%
rename from test_evm/test_data/vmBitwiseLogicOperationTest.json
rename to oyente/test_evm/test_data/vmBitwiseLogicOperationTest.json
diff --git a/test_evm/test_data/vmPushDupSwapTest.json b/oyente/test_evm/test_data/vmPushDupSwapTest.json
similarity index 100%
rename from test_evm/test_data/vmPushDupSwapTest.json
rename to oyente/test_evm/test_data/vmPushDupSwapTest.json
diff --git a/utils.py b/oyente/utils.py
similarity index 100%
rename from utils.py
rename to oyente/utils.py
diff --git a/vargenerator.py b/oyente/vargenerator.py
similarity index 100%
rename from vargenerator.py
rename to oyente/vargenerator.py
diff --git a/setup.py b/setup.py
new file mode 100644
index 00000000..d9d3842e
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,39 @@
+from setuptools import find_packages, setup
+
+setup(
+    name='oyente',
+    version='1.0.0',
+    author='Loi Luu',
+    # author_email='',
+    url='https://github.com/melonport/oyente',
+    description='An analysis tool for smart contracts',
+    long_description=open('README.md').read(),
+    license='GPL',
+    keywords='ethereum smart contracts',
+    classifiers=[
+        'Environment :: Console',
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: POSIX',
+        'Operating System :: MacOS :: MacOS X',
+        'Programming Language :: Python',
+        'Topic :: Utilities',
+    ],
+    packages=find_packages(),
+    package_data={
+        'oyente': ['state.json'],
+    },
+    entry_points={
+        'console_scripts': [
+            'oyente = oyente.oyente:main',
+        ]
+    },
+    install_requires=[
+        'requests',
+        'web3',
+    ]
+)