diff --git a/.travis.yml b/.travis.yml
index 5736b6b..e56d1cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ python:
   - "3.7"
   - "3.8"
 install:
-  - pip install -r portier/requirements.txt
+  - pip install -r requirements.txt
   - pip install flake8
 script:
   - flake8
diff --git a/portier/Dockerfile b/Dockerfile
similarity index 100%
rename from portier/Dockerfile
rename to Dockerfile
diff --git a/portier/manage.py b/manage.py
similarity index 100%
rename from portier/manage.py
rename to manage.py
diff --git a/portier-worker/main.py b/portier-worker/main.py
deleted file mode 100644
index 0509915..0000000
--- a/portier-worker/main.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from celery import Celery
-from xmlrpc.client import ServerProxy
-
-server = ServerProxy('http://localhost:9001/RPC2')
-app = Celery('tasks', broker='redis://localhost')
-
-print(server.supervisor.getState())
-
-@app.task
-def start_restream(name):
-    print(name)
-
-@app.task
-def stop_restream(name):
-    print(name)
diff --git a/portier-worker/portier-worker.py b/portier-worker/portier-worker.py
deleted file mode 100644
index 0509915..0000000
--- a/portier-worker/portier-worker.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from celery import Celery
-from xmlrpc.client import ServerProxy
-
-server = ServerProxy('http://localhost:9001/RPC2')
-app = Celery('tasks', broker='redis://localhost')
-
-print(server.supervisor.getState())
-
-@app.task
-def start_restream(name):
-    print(name)
-
-@app.task
-def stop_restream(name):
-    print(name)
diff --git a/portier/portier/__init__.py b/portier/__init__.py
similarity index 100%
rename from portier/portier/__init__.py
rename to portier/__init__.py
diff --git a/portier/portier/asgi.py b/portier/asgi.py
similarity index 100%
rename from portier/portier/asgi.py
rename to portier/asgi.py
diff --git a/portier/portier/celery.py b/portier/celery.py
similarity index 100%
rename from portier/portier/celery.py
rename to portier/celery.py
diff --git a/portier/portier/settings.py b/portier/settings.py
similarity index 100%
rename from portier/portier/settings.py
rename to portier/settings.py
diff --git a/portier/portier/urls.py b/portier/urls.py
similarity index 100%
rename from portier/portier/urls.py
rename to portier/urls.py
diff --git a/portier/portier/wsgi.py b/portier/wsgi.py
similarity index 100%
rename from portier/portier/wsgi.py
rename to portier/wsgi.py
diff --git a/portier/requirements.txt b/requirements.txt
similarity index 100%
rename from portier/requirements.txt
rename to requirements.txt
diff --git a/portier/restream/__init__.py b/restream/__init__.py
similarity index 100%
rename from portier/restream/__init__.py
rename to restream/__init__.py
diff --git a/portier/restream/admin.py b/restream/admin.py
similarity index 100%
rename from portier/restream/admin.py
rename to restream/admin.py
diff --git a/portier/restream/apps.py b/restream/apps.py
similarity index 100%
rename from portier/restream/apps.py
rename to restream/apps.py
diff --git a/portier/restream/migrations/0001_initial.py b/restream/migrations/0001_initial.py
similarity index 100%
rename from portier/restream/migrations/0001_initial.py
rename to restream/migrations/0001_initial.py
diff --git a/portier/restream/migrations/__init__.py b/restream/migrations/__init__.py
similarity index 100%
rename from portier/restream/migrations/__init__.py
rename to restream/migrations/__init__.py
diff --git a/portier/restream/models.py b/restream/models.py
similarity index 100%
rename from portier/restream/models.py
rename to restream/models.py
diff --git a/portier/restream/signals.py b/restream/signals.py
similarity index 100%
rename from portier/restream/signals.py
rename to restream/signals.py
diff --git a/portier/restream/tests.py b/restream/tests.py
similarity index 100%
rename from portier/restream/tests.py
rename to restream/tests.py
diff --git a/portier/restream/views.py b/restream/views.py
similarity index 100%
rename from portier/restream/views.py
rename to restream/views.py
diff --git a/portier/srs/__init__.py b/srs/__init__.py
similarity index 100%
rename from portier/srs/__init__.py
rename to srs/__init__.py
diff --git a/portier/srs/admin.py b/srs/admin.py
similarity index 100%
rename from portier/srs/admin.py
rename to srs/admin.py
diff --git a/portier/srs/apps.py b/srs/apps.py
similarity index 100%
rename from portier/srs/apps.py
rename to srs/apps.py
diff --git a/portier/srs/migrations/0001_initial.py b/srs/migrations/0001_initial.py
similarity index 100%
rename from portier/srs/migrations/0001_initial.py
rename to srs/migrations/0001_initial.py
diff --git a/portier/srs/migrations/0002_streamkey_name.py b/srs/migrations/0002_streamkey_name.py
similarity index 100%
rename from portier/srs/migrations/0002_streamkey_name.py
rename to srs/migrations/0002_streamkey_name.py
diff --git a/portier/srs/migrations/0003_remove_streamkey_owner.py b/srs/migrations/0003_remove_streamkey_owner.py
similarity index 100%
rename from portier/srs/migrations/0003_remove_streamkey_owner.py
rename to srs/migrations/0003_remove_streamkey_owner.py
diff --git a/portier/srs/migrations/0004_auto_20200413_1736.py b/srs/migrations/0004_auto_20200413_1736.py
similarity index 100%
rename from portier/srs/migrations/0004_auto_20200413_1736.py
rename to srs/migrations/0004_auto_20200413_1736.py
diff --git a/portier/srs/migrations/0005_auto_20200413_1745.py b/srs/migrations/0005_auto_20200413_1745.py
similarity index 100%
rename from portier/srs/migrations/0005_auto_20200413_1745.py
rename to srs/migrations/0005_auto_20200413_1745.py
diff --git a/portier/srs/migrations/__init__.py b/srs/migrations/__init__.py
similarity index 100%
rename from portier/srs/migrations/__init__.py
rename to srs/migrations/__init__.py
diff --git a/portier/srs/models.py b/srs/models.py
similarity index 100%
rename from portier/srs/models.py
rename to srs/models.py
diff --git a/portier/srs/signals.py b/srs/signals.py
similarity index 100%
rename from portier/srs/signals.py
rename to srs/signals.py
diff --git a/portier/srs/tests.py b/srs/tests.py
similarity index 100%
rename from portier/srs/tests.py
rename to srs/tests.py
diff --git a/portier/srs/urls.py b/srs/urls.py
similarity index 100%
rename from portier/srs/urls.py
rename to srs/urls.py
diff --git a/portier/srs/views.py b/srs/views.py
similarity index 100%
rename from portier/srs/views.py
rename to srs/views.py