diff --git a/__init__.py b/bcrypt/__init__.py
similarity index 54%
rename from __init__.py
rename to bcrypt/__init__.py
index c242c8b..828d246 100644
--- a/__init__.py
+++ b/bcrypt/__init__.py
@@ -3,3 +3,5 @@
 
 @author: Shay&Galia
 '''
+
+from bcrypt import hashpw, gensalt
diff --git a/bcrypt.py b/bcrypt/bcrypt.py
similarity index 100%
rename from bcrypt.py
rename to bcrypt/bcrypt.py
diff --git a/blowfish.py b/bcrypt/blowfish.py
similarity index 100%
rename from blowfish.py
rename to bcrypt/blowfish.py
diff --git a/simple_test.py b/bcrypt/simple_test.py
similarity index 100%
rename from simple_test.py
rename to bcrypt/simple_test.py
diff --git a/test.py b/bcrypt/test.py
similarity index 100%
rename from test.py
rename to bcrypt/test.py
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..6bfcc36
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+setup(
+    name='bcrypt',
+    version='0.1.0',
+    description='Native Python implementation of the py-bcrypt',
+    url='https://github.com/erlichmen/py-bcrypt.git',
+    author='Shay Erlichmen',
+    author_email='erlichmen@gmail.com',
+    license='MIT',
+    packages=['bcrypt'],
+    include_package_data=False,
+    zip_safe=False)