diff --git a/version.py b/multilingual/__init__.py
similarity index 100%
rename from version.py
rename to multilingual/__init__.py
diff --git a/main/__init__.py b/multilingual/search/__init__.py
similarity index 100%
rename from main/__init__.py
rename to multilingual/search/__init__.py
diff --git a/search/multilingual_xapian_backend.py b/multilingual/search/multilingual_xapian_backend.py
similarity index 100%
rename from search/multilingual_xapian_backend.py
rename to multilingual/search/multilingual_xapian_backend.py
diff --git a/main/test_app/__init__.py b/multilingual/utils/__init__.py
similarity index 100%
rename from main/test_app/__init__.py
rename to multilingual/utils/__init__.py
diff --git a/utils/fields.py b/multilingual/utils/fields.py
similarity index 100%
rename from utils/fields.py
rename to multilingual/utils/fields.py
diff --git a/setup.py b/setup.py
index 44c8a41..89e7c8b 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ def read(filename):
 
 setup(
     name='django-shared-multilingual',
-    version=__import__('version').__version__,
+    version=__import__('multilingual').__version__,
     description=' Collection Django tools for multilingual websites.',
     long_description=read('README.md'),
     author='Erik Stein',
@@ -22,30 +22,25 @@ setup(
     license='MIT License',
     platforms=['OS Independent'],
     packages=find_packages(
-        exclude=['tests', 'testapp', 'main'],
+        exclude=['tests', 'tests.*'],
     ),
     include_package_data=True,
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
         'Framework :: Django',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
+        'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        # 'Programming Language :: Python :: 2',
-        # 'Programming Language :: Python :: 2.7',
-        # 'Programming Language :: Python :: 3',
-        # 'Programming Language :: Python :: 3.3',
-        # 'Programming Language :: Python :: 3.4',
         'Topic :: Utilities',
     ],
     zip_safe=False,
-    tests_require=[
-        'Django',
-        # 'coverage',
-        # 'django-mptt',
-        # 'pytz',
-    ],
-    test_suite='main.runtests.runtests',
+    # tests_require=[
+    #     'Django',
+    #     # 'coverage',
+    #     # 'django-mptt',
+    #     # 'pytz',
+    # ],
+    # test_suite='main.runtests.runtests',
 )
diff --git a/main/test_app/migrations/__init__.py b/tests/__init__.py
similarity index 100%
rename from main/test_app/migrations/__init__.py
rename to tests/__init__.py
diff --git a/main/locale/de/LC_MESSAGES/django.po b/tests/locale/de/LC_MESSAGES/django.po
similarity index 100%
rename from main/locale/de/LC_MESSAGES/django.po
rename to tests/locale/de/LC_MESSAGES/django.po
diff --git a/main/locale/en/LC_MESSAGES/django.po b/tests/locale/en/LC_MESSAGES/django.po
similarity index 100%
rename from main/locale/en/LC_MESSAGES/django.po
rename to tests/locale/en/LC_MESSAGES/django.po
diff --git a/manage.py b/tests/runtests.py
similarity index 100%
rename from manage.py
rename to tests/runtests.py
diff --git a/main/settings.py b/tests/settings.py
similarity index 100%
rename from main/settings.py
rename to tests/settings.py
diff --git a/search/__init__.py b/tests/test_app/__init__.py
similarity index 100%
rename from search/__init__.py
rename to tests/test_app/__init__.py
diff --git a/main/test_app/admin.py b/tests/test_app/admin.py
similarity index 100%
rename from main/test_app/admin.py
rename to tests/test_app/admin.py
diff --git a/main/test_app/apps.py b/tests/test_app/apps.py
similarity index 100%
rename from main/test_app/apps.py
rename to tests/test_app/apps.py
diff --git a/main/test_app/migrations/0001_initial.py b/tests/test_app/migrations/0001_initial.py
similarity index 100%
rename from main/test_app/migrations/0001_initial.py
rename to tests/test_app/migrations/0001_initial.py
diff --git a/main/test_app/migrations/0002_auto_20170220_0928.py b/tests/test_app/migrations/0002_auto_20170220_0928.py
similarity index 100%
rename from main/test_app/migrations/0002_auto_20170220_0928.py
rename to tests/test_app/migrations/0002_auto_20170220_0928.py
diff --git a/utils/__init__.py b/tests/test_app/migrations/__init__.py
similarity index 100%
rename from utils/__init__.py
rename to tests/test_app/migrations/__init__.py
diff --git a/main/test_app/models.py b/tests/test_app/models.py
similarity index 100%
rename from main/test_app/models.py
rename to tests/test_app/models.py
diff --git a/main/test_app/search_indexes.py b/tests/test_app/search_indexes.py
similarity index 100%
rename from main/test_app/search_indexes.py
rename to tests/test_app/search_indexes.py
diff --git a/main/test_app/tests.py b/tests/test_app/tests.py
similarity index 100%
rename from main/test_app/tests.py
rename to tests/test_app/tests.py
diff --git a/main/test_app/views.py b/tests/test_app/views.py
similarity index 100%
rename from main/test_app/views.py
rename to tests/test_app/views.py
diff --git a/main/urls.py b/tests/urls.py
similarity index 100%
rename from main/urls.py
rename to tests/urls.py
diff --git a/main/wsgi.py b/tests/wsgi.py
similarity index 100%
rename from main/wsgi.py
rename to tests/wsgi.py