diff --git a/src/main/ui/package-lock.json b/app/web/package-lock.json
similarity index 100%
rename from src/main/ui/package-lock.json
rename to app/web/package-lock.json
diff --git a/src/main/ui/package.json b/app/web/package.json
similarity index 100%
rename from src/main/ui/package.json
rename to app/web/package.json
diff --git a/src/main/ui/public/favicon.ico b/app/web/public/favicon.ico
similarity index 100%
rename from src/main/ui/public/favicon.ico
rename to app/web/public/favicon.ico
diff --git a/src/main/ui/public/index.html b/app/web/public/index.html
similarity index 100%
rename from src/main/ui/public/index.html
rename to app/web/public/index.html
diff --git a/src/main/ui/public/manifest.json b/app/web/public/manifest.json
similarity index 100%
rename from src/main/ui/public/manifest.json
rename to app/web/public/manifest.json
diff --git a/src/main/ui/src/App.js b/app/web/src/App.js
similarity index 100%
rename from src/main/ui/src/App.js
rename to app/web/src/App.js
diff --git a/src/main/ui/src/assets/DashNET.svg b/app/web/src/assets/DashNET.svg
similarity index 100%
rename from src/main/ui/src/assets/DashNET.svg
rename to app/web/src/assets/DashNET.svg
diff --git a/src/main/ui/src/components/layout/header/Header.js b/app/web/src/components/layout/header/Header.js
similarity index 100%
rename from src/main/ui/src/components/layout/header/Header.js
rename to app/web/src/components/layout/header/Header.js
diff --git a/src/main/ui/src/components/layout/header/menu/ItemMenu.js b/app/web/src/components/layout/header/menu/ItemMenu.js
similarity index 100%
rename from src/main/ui/src/components/layout/header/menu/ItemMenu.js
rename to app/web/src/components/layout/header/menu/ItemMenu.js
diff --git a/src/main/ui/src/components/layout/header/menu/UserMenu.js b/app/web/src/components/layout/header/menu/UserMenu.js
similarity index 100%
rename from src/main/ui/src/components/layout/header/menu/UserMenu.js
rename to app/web/src/components/layout/header/menu/UserMenu.js
diff --git a/src/main/ui/src/components/layout/navigation/Navigation.js b/app/web/src/components/layout/navigation/Navigation.js
similarity index 100%
rename from src/main/ui/src/components/layout/navigation/Navigation.js
rename to app/web/src/components/layout/navigation/Navigation.js
diff --git a/src/main/ui/src/components/layout/search/Search.js b/app/web/src/components/layout/search/Search.js
similarity index 100%
rename from src/main/ui/src/components/layout/search/Search.js
rename to app/web/src/components/layout/search/Search.js
diff --git a/src/main/ui/src/components/layout/search/debounced/Debounced.js b/app/web/src/components/layout/search/debounced/Debounced.js
similarity index 100%
rename from src/main/ui/src/components/layout/search/debounced/Debounced.js
rename to app/web/src/components/layout/search/debounced/Debounced.js
diff --git a/src/main/ui/src/components/layout/search/searchRecord/SearchRecord.js b/app/web/src/components/layout/search/searchRecord/SearchRecord.js
similarity index 100%
rename from src/main/ui/src/components/layout/search/searchRecord/SearchRecord.js
rename to app/web/src/components/layout/search/searchRecord/SearchRecord.js
diff --git a/src/main/ui/src/components/pages/auth/AuthContainer.js b/app/web/src/components/pages/auth/AuthContainer.js
similarity index 100%
rename from src/main/ui/src/components/pages/auth/AuthContainer.js
rename to app/web/src/components/pages/auth/AuthContainer.js
diff --git a/src/main/ui/src/components/pages/auth/HandleSession.js b/app/web/src/components/pages/auth/HandleSession.js
similarity index 100%
rename from src/main/ui/src/components/pages/auth/HandleSession.js
rename to app/web/src/components/pages/auth/HandleSession.js
diff --git a/src/main/ui/src/components/pages/auth/login/Login.js b/app/web/src/components/pages/auth/login/Login.js
similarity index 100%
rename from src/main/ui/src/components/pages/auth/login/Login.js
rename to app/web/src/components/pages/auth/login/Login.js
diff --git a/src/main/ui/src/components/pages/auth/register/Register.js b/app/web/src/components/pages/auth/register/Register.js
similarity index 100%
rename from src/main/ui/src/components/pages/auth/register/Register.js
rename to app/web/src/components/pages/auth/register/Register.js
diff --git a/src/main/ui/src/components/pages/home/Home.js b/app/web/src/components/pages/home/Home.js
similarity index 100%
rename from src/main/ui/src/components/pages/home/Home.js
rename to app/web/src/components/pages/home/Home.js
diff --git a/src/main/ui/src/components/pages/home/HomeController.js b/app/web/src/components/pages/home/HomeController.js
similarity index 100%
rename from src/main/ui/src/components/pages/home/HomeController.js
rename to app/web/src/components/pages/home/HomeController.js
diff --git a/src/main/ui/src/components/pages/home/hcards/InfoCard.js b/app/web/src/components/pages/home/hcards/InfoCard.js
similarity index 100%
rename from src/main/ui/src/components/pages/home/hcards/InfoCard.js
rename to app/web/src/components/pages/home/hcards/InfoCard.js
diff --git a/src/main/ui/src/components/pages/home/hcards/InfoCardSkeleton.js b/app/web/src/components/pages/home/hcards/InfoCardSkeleton.js
similarity index 100%
rename from src/main/ui/src/components/pages/home/hcards/InfoCardSkeleton.js
rename to app/web/src/components/pages/home/hcards/InfoCardSkeleton.js
diff --git a/src/main/ui/src/components/pages/home/hcards/TeamCard.js b/app/web/src/components/pages/home/hcards/TeamCard.js
similarity index 100%
rename from src/main/ui/src/components/pages/home/hcards/TeamCard.js
rename to app/web/src/components/pages/home/hcards/TeamCard.js
diff --git a/src/main/ui/src/components/pages/home/teamHeader/TeamHeader.js b/app/web/src/components/pages/home/teamHeader/TeamHeader.js
similarity index 100%
rename from src/main/ui/src/components/pages/home/teamHeader/TeamHeader.js
rename to app/web/src/components/pages/home/teamHeader/TeamHeader.js
diff --git a/src/main/ui/src/components/pages/settings/ChangePassword.js b/app/web/src/components/pages/settings/ChangePassword.js
similarity index 100%
rename from src/main/ui/src/components/pages/settings/ChangePassword.js
rename to app/web/src/components/pages/settings/ChangePassword.js
diff --git a/src/main/ui/src/components/pages/settings/Profession.js b/app/web/src/components/pages/settings/Profession.js
similarity index 100%
rename from src/main/ui/src/components/pages/settings/Profession.js
rename to app/web/src/components/pages/settings/Profession.js
diff --git a/src/main/ui/src/components/pages/settings/Settings.js b/app/web/src/components/pages/settings/Settings.js
similarity index 100%
rename from src/main/ui/src/components/pages/settings/Settings.js
rename to app/web/src/components/pages/settings/Settings.js
diff --git a/src/main/ui/src/components/pages/settings/UserAvatar.js b/app/web/src/components/pages/settings/UserAvatar.js
similarity index 100%
rename from src/main/ui/src/components/pages/settings/UserAvatar.js
rename to app/web/src/components/pages/settings/UserAvatar.js
diff --git a/src/main/ui/src/components/pages/settings/UserInformation.js b/app/web/src/components/pages/settings/UserInformation.js
similarity index 100%
rename from src/main/ui/src/components/pages/settings/UserInformation.js
rename to app/web/src/components/pages/settings/UserInformation.js
diff --git a/src/main/ui/src/components/ui/InputGroup.js b/app/web/src/components/ui/InputGroup.js
similarity index 100%
rename from src/main/ui/src/components/ui/InputGroup.js
rename to app/web/src/components/ui/InputGroup.js
diff --git a/src/main/ui/src/components/ui/avatar/UserAvatar.js b/app/web/src/components/ui/avatar/UserAvatar.js
similarity index 100%
rename from src/main/ui/src/components/ui/avatar/UserAvatar.js
rename to app/web/src/components/ui/avatar/UserAvatar.js
diff --git a/src/main/ui/src/components/ui/grid/Grid.js b/app/web/src/components/ui/grid/Grid.js
similarity index 100%
rename from src/main/ui/src/components/ui/grid/Grid.js
rename to app/web/src/components/ui/grid/Grid.js
diff --git a/src/main/ui/src/index.js b/app/web/src/index.js
similarity index 100%
rename from src/main/ui/src/index.js
rename to app/web/src/index.js
diff --git a/src/main/ui/src/store/controllers/uiController.js b/app/web/src/store/controllers/uiController.js
similarity index 100%
rename from src/main/ui/src/store/controllers/uiController.js
rename to app/web/src/store/controllers/uiController.js
diff --git a/src/main/ui/src/store/controllers/userController.js b/app/web/src/store/controllers/userController.js
similarity index 100%
rename from src/main/ui/src/store/controllers/userController.js
rename to app/web/src/store/controllers/userController.js
diff --git a/src/main/ui/src/store/slices/teamSlice.js b/app/web/src/store/slices/teamSlice.js
similarity index 100%
rename from src/main/ui/src/store/slices/teamSlice.js
rename to app/web/src/store/slices/teamSlice.js
diff --git a/src/main/ui/src/store/slices/uiSlice.js b/app/web/src/store/slices/uiSlice.js
similarity index 100%
rename from src/main/ui/src/store/slices/uiSlice.js
rename to app/web/src/store/slices/uiSlice.js
diff --git a/src/main/ui/src/store/slices/userSlice.js b/app/web/src/store/slices/userSlice.js
similarity index 100%
rename from src/main/ui/src/store/slices/userSlice.js
rename to app/web/src/store/slices/userSlice.js
diff --git a/src/main/ui/src/store/store.js b/app/web/src/store/store.js
similarity index 100%
rename from src/main/ui/src/store/store.js
rename to app/web/src/store/store.js
diff --git a/src/main/ui/src/theme/dark/dark.js b/app/web/src/theme/dark/dark.js
similarity index 100%
rename from src/main/ui/src/theme/dark/dark.js
rename to app/web/src/theme/dark/dark.js
diff --git a/src/main/db/script/tasks.sql b/db/script/init.sql
similarity index 100%
rename from src/main/db/script/tasks.sql
rename to db/script/init.sql
diff --git a/docker-compose.yml b/docker-compose.yml
index ed672e7..491e920 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
       - SPRING_DATASOURCE_PASSWORD=${SPRING_DB_PASSWORD}
 
   frontend-production:
-    container_name: dashNet-react-fe-pro
+    container_name: dashNet-web-production
     build:
       context: .
       dockerfile: docker/React.Production.Dockerfile
@@ -40,7 +40,7 @@ services:
       - 'production'
 
   frontend-development:
-    container_name: dashNet-react-fe
+    container_name: dashNet-web-development
     profiles:
       - 'react'
       - 'no-admin'
@@ -95,7 +95,7 @@ services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
-    container_name: php_my_admin
+    container_name: dashNet-php-my-admin
     profiles:
       - 'phpadmin'
       - 'mysql-admin'
diff --git a/docker/MySql.Dockerfile b/docker/MySql.Dockerfile
index 2f7f43d..bb52f0a 100644
--- a/docker/MySql.Dockerfile
+++ b/docker/MySql.Dockerfile
@@ -2,4 +2,4 @@ FROM mysql:latest
 
 LABEL maintainer="Boris Blagojević <boris.blagojevicc@hotmail.com>"
 
-COPY ./src/main/db/script /docker-entrypoint-initdb.d/
+COPY ./db/script /docker-entrypoint-initdb.d/
diff --git a/docker/React.Dockerfile b/docker/React.Dockerfile
index bd6279b..69281a3 100644
--- a/docker/React.Dockerfile
+++ b/docker/React.Dockerfile
@@ -4,10 +4,10 @@ LABEL maintainer="Boris Blagojević <boris.blagojevicc@hotmail.com>"
 
 WORKDIR /app
 
-COPY ./src/main/ui/package*.json .
+COPY ./app/web/package*.json .
 
 RUN npm install
 
-COPY ./src/main/ui .
+COPY ./app/web .
 
 CMD npm start
\ No newline at end of file
diff --git a/docker/Spring.Dockerfile b/docker/Spring.Dockerfile
index b0cd6e4..7a17476 100644
--- a/docker/Spring.Dockerfile
+++ b/docker/Spring.Dockerfile
@@ -2,14 +2,14 @@ FROM eclipse-temurin:17-jdk-alpine
 
 LABEL maintainer="Boris Blagojević <boris.blagojevicc@hotmail.com>"
 
-COPY .mvn/ .mvn
-COPY mvnw mvnw.cmd pom.xml ./
+COPY ./service/.mvn/ .mvn
+COPY ./service/mvnw ./service/mvnw.cmd ./service/pom.xml ./
 
 RUN dos2unix mvnw && chmod +x mvnw
 
 RUN ./mvnw dependency:resolve
 
-COPY src/main/java ./src/main/java
-COPY src/main/resources ./src/main/resources
+COPY ./service/src/main/java ./src/main/java
+COPY ./service/src/main/resources ./src/main/resources
 
 CMD ["./mvnw", "spring-boot:run"]
\ No newline at end of file
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/service/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from .mvn/wrapper/MavenWrapperDownloader.java
rename to service/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/.mvn/wrapper/maven-wrapper.jar b/service/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from .mvn/wrapper/maven-wrapper.jar
rename to service/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/service/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from .mvn/wrapper/maven-wrapper.properties
rename to service/.mvn/wrapper/maven-wrapper.properties
diff --git a/mvnw b/service/mvnw
old mode 100755
new mode 100644
similarity index 100%
rename from mvnw
rename to service/mvnw
diff --git a/mvnw.cmd b/service/mvnw.cmd
similarity index 100%
rename from mvnw.cmd
rename to service/mvnw.cmd
diff --git a/pom.xml b/service/pom.xml
similarity index 100%
rename from pom.xml
rename to service/pom.xml
diff --git a/src/main/java/com/dashnet/dashNet/DashNetApplication.java b/service/src/main/java/com/dashnet/dashNet/DashNetApplication.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/DashNetApplication.java
rename to service/src/main/java/com/dashnet/dashNet/DashNetApplication.java
diff --git a/src/main/java/com/dashnet/dashNet/Security/JwtAuthFilter.java b/service/src/main/java/com/dashnet/dashNet/Security/JwtAuthFilter.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Security/JwtAuthFilter.java
rename to service/src/main/java/com/dashnet/dashNet/Security/JwtAuthFilter.java
diff --git a/src/main/java/com/dashnet/dashNet/Security/JwtUtils.java b/service/src/main/java/com/dashnet/dashNet/Security/JwtUtils.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Security/JwtUtils.java
rename to service/src/main/java/com/dashnet/dashNet/Security/JwtUtils.java
diff --git a/src/main/java/com/dashnet/dashNet/Security/SecurityConfig.java b/service/src/main/java/com/dashnet/dashNet/Security/SecurityConfig.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Security/SecurityConfig.java
rename to service/src/main/java/com/dashnet/dashNet/Security/SecurityConfig.java
diff --git a/src/main/java/com/dashnet/dashNet/Security/UserDetailsServiceImpl.java b/service/src/main/java/com/dashnet/dashNet/Security/UserDetailsServiceImpl.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Security/UserDetailsServiceImpl.java
rename to service/src/main/java/com/dashnet/dashNet/Security/UserDetailsServiceImpl.java
diff --git a/src/main/java/com/dashnet/dashNet/Task/Advices/TaskNotFoundAdvice.java b/service/src/main/java/com/dashnet/dashNet/Task/Advices/TaskNotFoundAdvice.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Task/Advices/TaskNotFoundAdvice.java
rename to service/src/main/java/com/dashnet/dashNet/Task/Advices/TaskNotFoundAdvice.java
diff --git a/src/main/java/com/dashnet/dashNet/Task/Exceptions/TaskNotFoundException.java b/service/src/main/java/com/dashnet/dashNet/Task/Exceptions/TaskNotFoundException.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Task/Exceptions/TaskNotFoundException.java
rename to service/src/main/java/com/dashnet/dashNet/Task/Exceptions/TaskNotFoundException.java
diff --git a/src/main/java/com/dashnet/dashNet/Task/Task.java b/service/src/main/java/com/dashnet/dashNet/Task/Task.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Task/Task.java
rename to service/src/main/java/com/dashnet/dashNet/Task/Task.java
diff --git a/src/main/java/com/dashnet/dashNet/Task/TaskController.java b/service/src/main/java/com/dashnet/dashNet/Task/TaskController.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Task/TaskController.java
rename to service/src/main/java/com/dashnet/dashNet/Task/TaskController.java
diff --git a/src/main/java/com/dashnet/dashNet/Task/TaskRepository.java b/service/src/main/java/com/dashnet/dashNet/Task/TaskRepository.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Task/TaskRepository.java
rename to service/src/main/java/com/dashnet/dashNet/Task/TaskRepository.java
diff --git a/src/main/java/com/dashnet/dashNet/Task/TaskService.java b/service/src/main/java/com/dashnet/dashNet/Task/TaskService.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/Task/TaskService.java
rename to service/src/main/java/com/dashnet/dashNet/Task/TaskService.java
diff --git a/src/main/java/com/dashnet/dashNet/User/User.java b/service/src/main/java/com/dashnet/dashNet/User/User.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/User/User.java
rename to service/src/main/java/com/dashnet/dashNet/User/User.java
diff --git a/src/main/java/com/dashnet/dashNet/User/UserController.java b/service/src/main/java/com/dashnet/dashNet/User/UserController.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/User/UserController.java
rename to service/src/main/java/com/dashnet/dashNet/User/UserController.java
diff --git a/src/main/java/com/dashnet/dashNet/User/UserRepository.java b/service/src/main/java/com/dashnet/dashNet/User/UserRepository.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/User/UserRepository.java
rename to service/src/main/java/com/dashnet/dashNet/User/UserRepository.java
diff --git a/src/main/java/com/dashnet/dashNet/User/UserResponse.java b/service/src/main/java/com/dashnet/dashNet/User/UserResponse.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/User/UserResponse.java
rename to service/src/main/java/com/dashnet/dashNet/User/UserResponse.java
diff --git a/src/main/java/com/dashnet/dashNet/User/UserService.java b/service/src/main/java/com/dashnet/dashNet/User/UserService.java
similarity index 100%
rename from src/main/java/com/dashnet/dashNet/User/UserService.java
rename to service/src/main/java/com/dashnet/dashNet/User/UserService.java
diff --git a/src/main/resources/application.properties b/service/src/main/resources/application.properties
similarity index 100%
rename from src/main/resources/application.properties
rename to service/src/main/resources/application.properties
diff --git a/src/test/java/com/dashnet/dashNet/DashNetApplicationTests.java b/service/src/test/java/com/dashnet/dashNet/DashNetApplicationTests.java
similarity index 100%
rename from src/test/java/com/dashnet/dashNet/DashNetApplicationTests.java
rename to service/src/test/java/com/dashnet/dashNet/DashNetApplicationTests.java