diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..d00233b
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,18 @@
+from setuptools import setup, find_packages
+import sys, os
+
+version = '0.1'
+
+setup(name='twik',
+      version=version,
+      description="Twik is an application that makes it easier to generate secure and different passwords for each website.",
+      keywords='twik password hash',
+      author='Alexandre Possebom',
+      author_email='alexandrepossebom@gmail.com',
+      url='https://github.com/coxande/Twik',
+      license='GPLv3',
+      packages=['twik'],
+      entry_points = {
+          'console_scripts': ['twik = twik:main'],
+      },
+      )
diff --git a/twik b/twik/__init__.py
old mode 100755
new mode 100644
similarity index 99%
rename from twik
rename to twik/__init__.py
index b20aae7..dd784cd
--- a/twik
+++ b/twik/__init__.py
@@ -126,7 +126,7 @@ def getpassword(tag, private_key, master_key, length, password_type):
     password = generatehash(hash, master_key, length, password_type)
     print "Your password is %s" % password
 
-if __name__ == "__main__":
+def main():
     global PasswordType
     PasswordType = enum(ALPHANUMERIC_AND_SPECIAL_CHARS=1, ALPHANUMERIC=2,
      NUMERIC=3)