diff --git a/package.json b/package.json
index 621e84e..2053978 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,13 @@
 {
   "name": "spooty",
-  "workspaces": [
-    "spooty-be",
-    "spooty-fe"
-  ],
+  "workspaces": ["src/*"],
   "scripts": {
-    "start:be": "npm run start:dev -w spooty-be",
-    "start:fe": "npm run start -w spooty-fe",
-    "build:be": "npm run build -w spooty-be",
-    "build:fe": "npm run build -w spooty-fe",
+    "start:be": "npm run start:dev -w backend",
+    "start:fe": "npm run start -w frontend",
+    "build:be": "npm run build -w backend",
+    "build:fe": "npm run build -w frontend",
     "build": "npm run build:be npm run build:fe",
-    "gen:fe": "npm run gen -w spooty-fe",
-    "start": "npm run start:prod -w spooty-be"
+    "gen:fe": "npm run gen -w frontend",
+    "start": "npm run start:prod -w backend"
   }
 }
diff --git a/spooty-be/.eslintrc.js b/src/backend/.eslintrc.js
similarity index 100%
rename from spooty-be/.eslintrc.js
rename to src/backend/.eslintrc.js
diff --git a/spooty-be/.gitignore b/src/backend/.gitignore
similarity index 100%
rename from spooty-be/.gitignore
rename to src/backend/.gitignore
diff --git a/spooty-be/.prettierrc b/src/backend/.prettierrc
similarity index 100%
rename from spooty-be/.prettierrc
rename to src/backend/.prettierrc
diff --git a/spooty-be/README.md b/src/backend/README.md
similarity index 100%
rename from spooty-be/README.md
rename to src/backend/README.md
diff --git a/spooty-be/nest-cli.json b/src/backend/nest-cli.json
similarity index 100%
rename from spooty-be/nest-cli.json
rename to src/backend/nest-cli.json
diff --git a/spooty-be/package.json b/src/backend/package.json
similarity index 99%
rename from spooty-be/package.json
rename to src/backend/package.json
index 9720639..6afde7e 100644
--- a/spooty-be/package.json
+++ b/src/backend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "spooty-be",
+  "name": "backend",
   "version": "0.0.1",
   "description": "",
   "author": "",
diff --git a/spooty-be/src/app.controller.spec.ts b/src/backend/src/app.controller.spec.ts
similarity index 100%
rename from spooty-be/src/app.controller.spec.ts
rename to src/backend/src/app.controller.spec.ts
diff --git a/spooty-be/src/app.controller.ts b/src/backend/src/app.controller.ts
similarity index 100%
rename from spooty-be/src/app.controller.ts
rename to src/backend/src/app.controller.ts
diff --git a/spooty-be/src/app.module.ts b/src/backend/src/app.module.ts
similarity index 100%
rename from spooty-be/src/app.module.ts
rename to src/backend/src/app.module.ts
diff --git a/spooty-be/src/main.ts b/src/backend/src/main.ts
similarity index 100%
rename from spooty-be/src/main.ts
rename to src/backend/src/main.ts
diff --git a/spooty-be/src/playlist/playlist.controller.ts b/src/backend/src/playlist/playlist.controller.ts
similarity index 100%
rename from spooty-be/src/playlist/playlist.controller.ts
rename to src/backend/src/playlist/playlist.controller.ts
diff --git a/spooty-be/src/playlist/playlist.entity.ts b/src/backend/src/playlist/playlist.entity.ts
similarity index 100%
rename from spooty-be/src/playlist/playlist.entity.ts
rename to src/backend/src/playlist/playlist.entity.ts
diff --git a/spooty-be/src/playlist/playlist.model.ts b/src/backend/src/playlist/playlist.model.ts
similarity index 100%
rename from spooty-be/src/playlist/playlist.model.ts
rename to src/backend/src/playlist/playlist.model.ts
diff --git a/spooty-be/src/playlist/playlist.module.ts b/src/backend/src/playlist/playlist.module.ts
similarity index 100%
rename from spooty-be/src/playlist/playlist.module.ts
rename to src/backend/src/playlist/playlist.module.ts
diff --git a/spooty-be/src/playlist/playlist.service.ts b/src/backend/src/playlist/playlist.service.ts
similarity index 100%
rename from spooty-be/src/playlist/playlist.service.ts
rename to src/backend/src/playlist/playlist.service.ts
diff --git a/spooty-be/src/track/track.controller.ts b/src/backend/src/track/track.controller.ts
similarity index 100%
rename from spooty-be/src/track/track.controller.ts
rename to src/backend/src/track/track.controller.ts
diff --git a/spooty-be/src/track/track.entity.ts b/src/backend/src/track/track.entity.ts
similarity index 100%
rename from spooty-be/src/track/track.entity.ts
rename to src/backend/src/track/track.entity.ts
diff --git a/spooty-be/src/track/track.model.ts b/src/backend/src/track/track.model.ts
similarity index 100%
rename from spooty-be/src/track/track.model.ts
rename to src/backend/src/track/track.model.ts
diff --git a/spooty-be/src/track/track.module.ts b/src/backend/src/track/track.module.ts
similarity index 100%
rename from spooty-be/src/track/track.module.ts
rename to src/backend/src/track/track.module.ts
diff --git a/spooty-be/src/track/track.service.ts b/src/backend/src/track/track.service.ts
similarity index 100%
rename from spooty-be/src/track/track.service.ts
rename to src/backend/src/track/track.service.ts
diff --git a/spooty-be/test/app.e2e-spec.ts b/src/backend/test/app.e2e-spec.ts
similarity index 100%
rename from spooty-be/test/app.e2e-spec.ts
rename to src/backend/test/app.e2e-spec.ts
diff --git a/spooty-be/test/jest-e2e.json b/src/backend/test/jest-e2e.json
similarity index 100%
rename from spooty-be/test/jest-e2e.json
rename to src/backend/test/jest-e2e.json
diff --git a/spooty-be/tsconfig.build.json b/src/backend/tsconfig.build.json
similarity index 100%
rename from spooty-be/tsconfig.build.json
rename to src/backend/tsconfig.build.json
diff --git a/spooty-be/tsconfig.json b/src/backend/tsconfig.json
similarity index 100%
rename from spooty-be/tsconfig.json
rename to src/backend/tsconfig.json
diff --git a/spooty-fe/.editorconfig b/src/frontend/.editorconfig
similarity index 100%
rename from spooty-fe/.editorconfig
rename to src/frontend/.editorconfig
diff --git a/spooty-fe/.gitignore b/src/frontend/.gitignore
similarity index 100%
rename from spooty-fe/.gitignore
rename to src/frontend/.gitignore
diff --git a/spooty-fe/.sassrc  b/src/frontend/.sassrc 
similarity index 100%
rename from spooty-fe/.sassrc 
rename to src/frontend/.sassrc 
diff --git a/spooty-fe/.vscode/extensions.json b/src/frontend/.vscode/extensions.json
similarity index 100%
rename from spooty-fe/.vscode/extensions.json
rename to src/frontend/.vscode/extensions.json
diff --git a/spooty-fe/.vscode/launch.json b/src/frontend/.vscode/launch.json
similarity index 100%
rename from spooty-fe/.vscode/launch.json
rename to src/frontend/.vscode/launch.json
diff --git a/spooty-fe/.vscode/tasks.json b/src/frontend/.vscode/tasks.json
similarity index 100%
rename from spooty-fe/.vscode/tasks.json
rename to src/frontend/.vscode/tasks.json
diff --git a/spooty-fe/README.md b/src/frontend/README.md
similarity index 100%
rename from spooty-fe/README.md
rename to src/frontend/README.md
diff --git a/spooty-fe/angular.json b/src/frontend/angular.json
similarity index 100%
rename from spooty-fe/angular.json
rename to src/frontend/angular.json
diff --git a/spooty-fe/package.json b/src/frontend/package.json
similarity index 98%
rename from spooty-fe/package.json
rename to src/frontend/package.json
index 25b6f52..a1da7be 100644
--- a/spooty-fe/package.json
+++ b/src/frontend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "spooty-fe",
+  "name": "frontend",
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
diff --git a/spooty-fe/proxy.conf.json b/src/frontend/proxy.conf.json
similarity index 100%
rename from spooty-fe/proxy.conf.json
rename to src/frontend/proxy.conf.json
diff --git a/spooty-fe/public/favicon.ico b/src/frontend/public/favicon.ico
similarity index 100%
rename from spooty-fe/public/favicon.ico
rename to src/frontend/public/favicon.ico
diff --git a/spooty-fe/src/app/app.component.html b/src/frontend/src/app/app.component.html
similarity index 100%
rename from spooty-fe/src/app/app.component.html
rename to src/frontend/src/app/app.component.html
diff --git a/spooty-fe/src/app/app.component.scss b/src/frontend/src/app/app.component.scss
similarity index 100%
rename from spooty-fe/src/app/app.component.scss
rename to src/frontend/src/app/app.component.scss
diff --git a/spooty-fe/src/app/app.component.spec.ts b/src/frontend/src/app/app.component.spec.ts
similarity index 100%
rename from spooty-fe/src/app/app.component.spec.ts
rename to src/frontend/src/app/app.component.spec.ts
diff --git a/spooty-fe/src/app/app.component.ts b/src/frontend/src/app/app.component.ts
similarity index 100%
rename from spooty-fe/src/app/app.component.ts
rename to src/frontend/src/app/app.component.ts
diff --git a/spooty-fe/src/app/app.config.ts b/src/frontend/src/app/app.config.ts
similarity index 100%
rename from spooty-fe/src/app/app.config.ts
rename to src/frontend/src/app/app.config.ts
diff --git a/spooty-fe/src/app/app.routes.ts b/src/frontend/src/app/app.routes.ts
similarity index 100%
rename from spooty-fe/src/app/app.routes.ts
rename to src/frontend/src/app/app.routes.ts
diff --git a/spooty-fe/src/app/components/playlist-box/playlist-box.component.html b/src/frontend/src/app/components/playlist-box/playlist-box.component.html
similarity index 100%
rename from spooty-fe/src/app/components/playlist-box/playlist-box.component.html
rename to src/frontend/src/app/components/playlist-box/playlist-box.component.html
diff --git a/spooty-fe/src/app/components/playlist-box/playlist-box.component.scss b/src/frontend/src/app/components/playlist-box/playlist-box.component.scss
similarity index 100%
rename from spooty-fe/src/app/components/playlist-box/playlist-box.component.scss
rename to src/frontend/src/app/components/playlist-box/playlist-box.component.scss
diff --git a/spooty-fe/src/app/components/playlist-box/playlist-box.component.spec.ts b/src/frontend/src/app/components/playlist-box/playlist-box.component.spec.ts
similarity index 100%
rename from spooty-fe/src/app/components/playlist-box/playlist-box.component.spec.ts
rename to src/frontend/src/app/components/playlist-box/playlist-box.component.spec.ts
diff --git a/spooty-fe/src/app/components/playlist-box/playlist-box.component.ts b/src/frontend/src/app/components/playlist-box/playlist-box.component.ts
similarity index 100%
rename from spooty-fe/src/app/components/playlist-box/playlist-box.component.ts
rename to src/frontend/src/app/components/playlist-box/playlist-box.component.ts
diff --git a/spooty-fe/src/app/components/track-list/track-list.component.html b/src/frontend/src/app/components/track-list/track-list.component.html
similarity index 100%
rename from spooty-fe/src/app/components/track-list/track-list.component.html
rename to src/frontend/src/app/components/track-list/track-list.component.html
diff --git a/spooty-fe/src/app/components/track-list/track-list.component.scss b/src/frontend/src/app/components/track-list/track-list.component.scss
similarity index 100%
rename from spooty-fe/src/app/components/track-list/track-list.component.scss
rename to src/frontend/src/app/components/track-list/track-list.component.scss
diff --git a/spooty-fe/src/app/components/track-list/track-list.component.spec.ts b/src/frontend/src/app/components/track-list/track-list.component.spec.ts
similarity index 100%
rename from spooty-fe/src/app/components/track-list/track-list.component.spec.ts
rename to src/frontend/src/app/components/track-list/track-list.component.spec.ts
diff --git a/spooty-fe/src/app/components/track-list/track-list.component.ts b/src/frontend/src/app/components/track-list/track-list.component.ts
similarity index 100%
rename from spooty-fe/src/app/components/track-list/track-list.component.ts
rename to src/frontend/src/app/components/track-list/track-list.component.ts
diff --git a/spooty-fe/src/app/services/playlist.service.spec.ts b/src/frontend/src/app/services/playlist.service.spec.ts
similarity index 100%
rename from spooty-fe/src/app/services/playlist.service.spec.ts
rename to src/frontend/src/app/services/playlist.service.spec.ts
diff --git a/spooty-fe/src/app/services/playlist.service.ts b/src/frontend/src/app/services/playlist.service.ts
similarity index 100%
rename from spooty-fe/src/app/services/playlist.service.ts
rename to src/frontend/src/app/services/playlist.service.ts
diff --git a/spooty-fe/src/app/services/track.service.spec.ts b/src/frontend/src/app/services/track.service.spec.ts
similarity index 100%
rename from spooty-fe/src/app/services/track.service.spec.ts
rename to src/frontend/src/app/services/track.service.spec.ts
diff --git a/spooty-fe/src/app/services/track.service.ts b/src/frontend/src/app/services/track.service.ts
similarity index 100%
rename from spooty-fe/src/app/services/track.service.ts
rename to src/frontend/src/app/services/track.service.ts
diff --git a/spooty-fe/src/index.html b/src/frontend/src/index.html
similarity index 100%
rename from spooty-fe/src/index.html
rename to src/frontend/src/index.html
diff --git a/spooty-fe/src/main.ts b/src/frontend/src/main.ts
similarity index 100%
rename from spooty-fe/src/main.ts
rename to src/frontend/src/main.ts
diff --git a/spooty-fe/src/styles.scss b/src/frontend/src/styles.scss
similarity index 100%
rename from spooty-fe/src/styles.scss
rename to src/frontend/src/styles.scss
diff --git a/spooty-fe/tsconfig.app.json b/src/frontend/tsconfig.app.json
similarity index 100%
rename from spooty-fe/tsconfig.app.json
rename to src/frontend/tsconfig.app.json
diff --git a/spooty-fe/tsconfig.json b/src/frontend/tsconfig.json
similarity index 100%
rename from spooty-fe/tsconfig.json
rename to src/frontend/tsconfig.json
diff --git a/spooty-fe/tsconfig.spec.json b/src/frontend/tsconfig.spec.json
similarity index 100%
rename from spooty-fe/tsconfig.spec.json
rename to src/frontend/tsconfig.spec.json