diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..efa752e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include *.md
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..c9b154e
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,39 @@
+from setuptools import setup
+
+def readme():
+	with open('README.md') as f:
+		return f.read()
+
+setup(name='transwhat',
+	version='0.2',
+	description='A gateway between the XMPP and the WhatsApp IM networks',
+	long_description=readme(),
+	keywords='whatsapp xmpp im gateway transport yowsup',
+	url='https://github.com/stv0g/transwhat',
+	author='Steffen Vogel',
+	author_email='stv0g@0l.de',
+	classifiers=[
+		'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+		'Development Status :: 4 - Beta',
+		'Environment :: Plugins',
+		'Operating System :: POSIX',
+		'Topic :: Communications :: Chat'
+	],
+	license='GPL-3+',
+	packages=[
+		'transWhat',
+		'Spectrum2'
+	],
+	install_requires=[
+		'protobuf',
+		'yowsup2',
+		'e4u',
+		'Pillow',
+		'python-dateutil'
+	],
+	entry_points={
+		'console_scripts': ['transwhat=transWhat.transwhat:main'],
+	},
+	zip_safe=False,
+	include_package_data=True
+)
diff --git a/transWhat/__init__.py b/transWhat/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/bot.py b/transWhat/bot.py
similarity index 100%
rename from bot.py
rename to transWhat/bot.py
diff --git a/buddy.py b/transWhat/buddy.py
similarity index 100%
rename from buddy.py
rename to transWhat/buddy.py
diff --git a/deferred.py b/transWhat/deferred.py
similarity index 100%
rename from deferred.py
rename to transWhat/deferred.py
diff --git a/group.py b/transWhat/group.py
similarity index 100%
rename from group.py
rename to transWhat/group.py
diff --git a/registersession.py b/transWhat/registersession.py
similarity index 100%
rename from registersession.py
rename to transWhat/registersession.py
diff --git a/session.py b/transWhat/session.py
similarity index 100%
rename from session.py
rename to transWhat/session.py
diff --git a/threadutils.py b/transWhat/threadutils.py
similarity index 100%
rename from threadutils.py
rename to transWhat/threadutils.py
diff --git a/transwhat.py b/transWhat/transwhat.py
similarity index 97%
rename from transwhat.py
rename to transWhat/transwhat.py
index 07e36bf..cd08796 100755
--- a/transwhat.py
+++ b/transWhat/transwhat.py
@@ -47,7 +47,7 @@ parser.add_argument('--host', type=str, required=True)
 parser.add_argument('--port', type=int, required=True)
 parser.add_argument('--service.backend_id', metavar="ID", type=int, required=True)
 parser.add_argument('config', type=str)
-parser.add_argument('-j', type=str, required=True)
+parser.add_argument('-j', type=str, metavar="JID", required=True)
 
 args, unknown = parser.parse_known_args()
 
diff --git a/utils.py b/transWhat/utils.py
similarity index 100%
rename from utils.py
rename to transWhat/utils.py
diff --git a/whatsappbackend.py b/transWhat/whatsappbackend.py
similarity index 100%
rename from whatsappbackend.py
rename to transWhat/whatsappbackend.py
diff --git a/yowsupwrapper.py b/transWhat/yowsupwrapper.py
similarity index 100%
rename from yowsupwrapper.py
rename to transWhat/yowsupwrapper.py