diff --git a/onionshare-tails b/onionshare-tails
deleted file mode 100755
index 4e0b415f..00000000
--- a/onionshare-tails
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [[ $EUID -ne 0 ]]; then
-    echo "You need to run this as root" 1>&2
-    exit 1
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-export ONIONSHARE_PLATFORM=Tails
-$DIR/onionshare $@
-
diff --git a/404.html b/onionshare/404.html
similarity index 100%
rename from 404.html
rename to onionshare/404.html
diff --git a/onionshare/__init__.py b/onionshare/__init__.py
new file mode 100644
index 00000000..4da95c7f
--- /dev/null
+++ b/onionshare/__init__.py
@@ -0,0 +1 @@
+from onionshare import *
diff --git a/index.html b/onionshare/index.html
similarity index 100%
rename from index.html
rename to onionshare/index.html
diff --git a/onionshare b/onionshare/onionshare.py
old mode 100755
new mode 100644
similarity index 98%
rename from onionshare
rename to onionshare/onionshare.py
index df6c2aad..62abbb36
--- a/onionshare
+++ b/onionshare/onionshare.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import os, sys, subprocess, time, hashlib, platform, json, locale, socket
 from random import randint
 from functools import wraps
@@ -139,6 +137,3 @@ def main():
 
     # shutdown
     tails_close_port(port)
-
-if __name__ == '__main__':
-    main()
diff --git a/strings.json b/onionshare/strings.json
similarity index 100%
rename from strings.json
rename to onionshare/strings.json
diff --git a/setup.py b/setup.py
index f99a8273..b8722c88 100644
--- a/setup.py
+++ b/setup.py
@@ -4,13 +4,11 @@
 import os
 import sys
 
-
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
-
 if sys.argv[-1] == 'publish':
     os.system('python setup.py sdist upload')
     sys.exit()
@@ -23,24 +21,25 @@ setup(
     author='Micah Lee',
     author_email='micah@micahflee.com',
     url='https://github.com/micahflee/onionshare',
-    py_modules = ['onionshare'],
     include_package_data=True,
     install_requires=[
         'flask >= 0.10.1',
         'stem >= 1.1.1'
     ],
     license="GPL v3",
-    zip_safe=False,
     keywords='onion, share, onionshare, tor, anonymous, web server',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
+        'Intended Audience :: End Users/Desktop',
         'License :: OSI Approved :: GPL License',
-        'Natural Language :: English',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Operating System :: MacOS :: MacOS X',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: POSIX',
     ],
-    test_suite='tests',
-    entry_points={'console_scripts': ['onionshare = onionshare:main']}
+    packages=['onionshare'],
+    scripts=['bin/onionshare', 'bin/tails-onionshare']
 )