diff --git a/SAS/TMSS/src/tmss/tmss/CMakeLists.txt b/SAS/TMSS/src/tmss/tmssapp/CMakeLists.txt
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/CMakeLists.txt
rename to SAS/TMSS/src/tmss/tmssapp/CMakeLists.txt
diff --git a/SAS/TMSS/src/tmss/tmss/__init__.py b/SAS/TMSS/src/tmss/tmssapp/__init__.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/__init__.py
rename to SAS/TMSS/src/tmss/tmssapp/__init__.py
diff --git a/SAS/TMSS/src/tmss/tmss/admin.py b/SAS/TMSS/src/tmss/tmssapp/admin.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/admin.py
rename to SAS/TMSS/src/tmss/tmssapp/admin.py
diff --git a/SAS/TMSS/src/tmss/tmss/apps.py b/SAS/TMSS/src/tmss/tmssapp/apps.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/apps.py
rename to SAS/TMSS/src/tmss/tmssapp/apps.py
diff --git a/SAS/TMSS/src/tmss/tmss/migrations/0001_initial.py b/SAS/TMSS/src/tmss/tmssapp/migrations/0001_initial.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/migrations/0001_initial.py
rename to SAS/TMSS/src/tmss/tmssapp/migrations/0001_initial.py
diff --git a/SAS/TMSS/src/tmss/tmss/migrations/0002_auto_20190606_1535.py b/SAS/TMSS/src/tmss/tmssapp/migrations/0002_auto_20190606_1535.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/migrations/0002_auto_20190606_1535.py
rename to SAS/TMSS/src/tmss/tmssapp/migrations/0002_auto_20190606_1535.py
diff --git a/SAS/TMSS/src/tmss/tmss/migrations/0003_populate.py b/SAS/TMSS/src/tmss/tmssapp/migrations/0003_populate.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/migrations/0003_populate.py
rename to SAS/TMSS/src/tmss/tmssapp/migrations/0003_populate.py
diff --git a/SAS/TMSS/src/tmss/tmss/migrations/CMakeLists.txt b/SAS/TMSS/src/tmss/tmssapp/migrations/CMakeLists.txt
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/migrations/CMakeLists.txt
rename to SAS/TMSS/src/tmss/tmssapp/migrations/CMakeLists.txt
diff --git a/SAS/TMSS/src/tmss/tmss/migrations/__init__.py b/SAS/TMSS/src/tmss/tmssapp/migrations/__init__.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/migrations/__init__.py
rename to SAS/TMSS/src/tmss/tmssapp/migrations/__init__.py
diff --git a/SAS/TMSS/src/tmss/tmss/models/CMakeLists.txt b/SAS/TMSS/src/tmss/tmssapp/models/CMakeLists.txt
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/models/CMakeLists.txt
rename to SAS/TMSS/src/tmss/tmssapp/models/CMakeLists.txt
diff --git a/SAS/TMSS/src/tmss/tmss/models/__init__.py b/SAS/TMSS/src/tmss/tmssapp/models/__init__.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/models/__init__.py
rename to SAS/TMSS/src/tmss/tmssapp/models/__init__.py
diff --git a/SAS/TMSS/src/tmss/tmss/models/scheduling.py b/SAS/TMSS/src/tmss/tmssapp/models/scheduling.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/models/scheduling.py
rename to SAS/TMSS/src/tmss/tmssapp/models/scheduling.py
diff --git a/SAS/TMSS/src/tmss/tmss/models/specification.py b/SAS/TMSS/src/tmss/tmssapp/models/specification.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/models/specification.py
rename to SAS/TMSS/src/tmss/tmssapp/models/specification.py
diff --git a/SAS/TMSS/src/tmss/tmss/populate.py b/SAS/TMSS/src/tmss/tmssapp/populate.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/populate.py
rename to SAS/TMSS/src/tmss/tmssapp/populate.py
diff --git a/SAS/TMSS/src/tmss/tmss/serializers/CMakeLists.txt b/SAS/TMSS/src/tmss/tmssapp/serializers/CMakeLists.txt
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/serializers/CMakeLists.txt
rename to SAS/TMSS/src/tmss/tmssapp/serializers/CMakeLists.txt
diff --git a/SAS/TMSS/src/tmss/tmss/serializers/__init__.py b/SAS/TMSS/src/tmss/tmssapp/serializers/__init__.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/serializers/__init__.py
rename to SAS/TMSS/src/tmss/tmssapp/serializers/__init__.py
diff --git a/SAS/TMSS/src/tmss/tmss/serializers/scheduling.py b/SAS/TMSS/src/tmss/tmssapp/serializers/scheduling.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/serializers/scheduling.py
rename to SAS/TMSS/src/tmss/tmssapp/serializers/scheduling.py
diff --git a/SAS/TMSS/src/tmss/tmss/serializers/specification.py b/SAS/TMSS/src/tmss/tmssapp/serializers/specification.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/serializers/specification.py
rename to SAS/TMSS/src/tmss/tmssapp/serializers/specification.py
diff --git a/SAS/TMSS/src/tmss/tmss/viewsets/CMakeLists.txt b/SAS/TMSS/src/tmss/tmssapp/viewsets/CMakeLists.txt
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/viewsets/CMakeLists.txt
rename to SAS/TMSS/src/tmss/tmssapp/viewsets/CMakeLists.txt
diff --git a/SAS/TMSS/src/tmss/tmss/viewsets/__init__.py b/SAS/TMSS/src/tmss/tmssapp/viewsets/__init__.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/viewsets/__init__.py
rename to SAS/TMSS/src/tmss/tmssapp/viewsets/__init__.py
diff --git a/SAS/TMSS/src/tmss/tmss/viewsets/lofar_viewset.py b/SAS/TMSS/src/tmss/tmssapp/viewsets/lofar_viewset.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/viewsets/lofar_viewset.py
rename to SAS/TMSS/src/tmss/tmssapp/viewsets/lofar_viewset.py
diff --git a/SAS/TMSS/src/tmss/tmss/viewsets/scheduling.py b/SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/viewsets/scheduling.py
rename to SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py
diff --git a/SAS/TMSS/src/tmss/tmss/viewsets/specification.py b/SAS/TMSS/src/tmss/tmssapp/viewsets/specification.py
similarity index 100%
rename from SAS/TMSS/src/tmss/tmss/viewsets/specification.py
rename to SAS/TMSS/src/tmss/tmssapp/viewsets/specification.py