diff --git a/app/server/server/pom.xml b/app/server/pom.xml
similarity index 100%
rename from app/server/server/pom.xml
rename to app/server/pom.xml
diff --git a/app/server/server/src/main/java/com/mobtools/server/ServerApplication.java b/app/server/src/main/java/com/mobtools/server/ServerApplication.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/ServerApplication.java
rename to app/server/src/main/java/com/mobtools/server/ServerApplication.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/configurations/CommonConfig.java b/app/server/src/main/java/com/mobtools/server/configurations/CommonConfig.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/configurations/CommonConfig.java
rename to app/server/src/main/java/com/mobtools/server/configurations/CommonConfig.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/configurations/MongoConfig.java b/app/server/src/main/java/com/mobtools/server/configurations/MongoConfig.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/configurations/MongoConfig.java
rename to app/server/src/main/java/com/mobtools/server/configurations/MongoConfig.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/configurations/SecurityConfig.java b/app/server/src/main/java/com/mobtools/server/configurations/SecurityConfig.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/configurations/SecurityConfig.java
rename to app/server/src/main/java/com/mobtools/server/configurations/SecurityConfig.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/constants/Security.java b/app/server/src/main/java/com/mobtools/server/constants/Security.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/constants/Security.java
rename to app/server/src/main/java/com/mobtools/server/constants/Security.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/constants/Url.java b/app/server/src/main/java/com/mobtools/server/constants/Url.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/constants/Url.java
rename to app/server/src/main/java/com/mobtools/server/constants/Url.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/controllers/BaseController.java b/app/server/src/main/java/com/mobtools/server/controllers/BaseController.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/controllers/BaseController.java
rename to app/server/src/main/java/com/mobtools/server/controllers/BaseController.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/controllers/IndexController.java b/app/server/src/main/java/com/mobtools/server/controllers/IndexController.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/controllers/IndexController.java
rename to app/server/src/main/java/com/mobtools/server/controllers/IndexController.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/controllers/LayoutController.java b/app/server/src/main/java/com/mobtools/server/controllers/LayoutController.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/controllers/LayoutController.java
rename to app/server/src/main/java/com/mobtools/server/controllers/LayoutController.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/controllers/TenantController.java b/app/server/src/main/java/com/mobtools/server/controllers/TenantController.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/controllers/TenantController.java
rename to app/server/src/main/java/com/mobtools/server/controllers/TenantController.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/controllers/WidgetController.java b/app/server/src/main/java/com/mobtools/server/controllers/WidgetController.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/controllers/WidgetController.java
rename to app/server/src/main/java/com/mobtools/server/controllers/WidgetController.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/domains/BaseDomain.java b/app/server/src/main/java/com/mobtools/server/domains/BaseDomain.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/domains/BaseDomain.java
rename to app/server/src/main/java/com/mobtools/server/domains/BaseDomain.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/domains/Layout.java b/app/server/src/main/java/com/mobtools/server/domains/Layout.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/domains/Layout.java
rename to app/server/src/main/java/com/mobtools/server/domains/Layout.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/domains/PricingPlan.java b/app/server/src/main/java/com/mobtools/server/domains/PricingPlan.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/domains/PricingPlan.java
rename to app/server/src/main/java/com/mobtools/server/domains/PricingPlan.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/domains/Role.java b/app/server/src/main/java/com/mobtools/server/domains/Role.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/domains/Role.java
rename to app/server/src/main/java/com/mobtools/server/domains/Role.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/domains/Tenant.java b/app/server/src/main/java/com/mobtools/server/domains/Tenant.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/domains/Tenant.java
rename to app/server/src/main/java/com/mobtools/server/domains/Tenant.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/domains/User.java b/app/server/src/main/java/com/mobtools/server/domains/User.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/domains/User.java
rename to app/server/src/main/java/com/mobtools/server/domains/User.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/domains/Widget.java b/app/server/src/main/java/com/mobtools/server/domains/Widget.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/domains/Widget.java
rename to app/server/src/main/java/com/mobtools/server/domains/Widget.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/domains/WidgetType.java b/app/server/src/main/java/com/mobtools/server/domains/WidgetType.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/domains/WidgetType.java
rename to app/server/src/main/java/com/mobtools/server/domains/WidgetType.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/dtos/ResponseDto.java b/app/server/src/main/java/com/mobtools/server/dtos/ResponseDto.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/dtos/ResponseDto.java
rename to app/server/src/main/java/com/mobtools/server/dtos/ResponseDto.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/repositories/BaseRepository.java b/app/server/src/main/java/com/mobtools/server/repositories/BaseRepository.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/repositories/BaseRepository.java
rename to app/server/src/main/java/com/mobtools/server/repositories/BaseRepository.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/repositories/LayoutRepository.java b/app/server/src/main/java/com/mobtools/server/repositories/LayoutRepository.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/repositories/LayoutRepository.java
rename to app/server/src/main/java/com/mobtools/server/repositories/LayoutRepository.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/repositories/TenantRepository.java b/app/server/src/main/java/com/mobtools/server/repositories/TenantRepository.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/repositories/TenantRepository.java
rename to app/server/src/main/java/com/mobtools/server/repositories/TenantRepository.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/repositories/UserRepository.java b/app/server/src/main/java/com/mobtools/server/repositories/UserRepository.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/repositories/UserRepository.java
rename to app/server/src/main/java/com/mobtools/server/repositories/UserRepository.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/repositories/WidgetRepository.java b/app/server/src/main/java/com/mobtools/server/repositories/WidgetRepository.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/repositories/WidgetRepository.java
rename to app/server/src/main/java/com/mobtools/server/repositories/WidgetRepository.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/BaseService.java b/app/server/src/main/java/com/mobtools/server/services/BaseService.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/BaseService.java
rename to app/server/src/main/java/com/mobtools/server/services/BaseService.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/CrudService.java b/app/server/src/main/java/com/mobtools/server/services/CrudService.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/CrudService.java
rename to app/server/src/main/java/com/mobtools/server/services/CrudService.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/LayoutService.java b/app/server/src/main/java/com/mobtools/server/services/LayoutService.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/LayoutService.java
rename to app/server/src/main/java/com/mobtools/server/services/LayoutService.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/LayoutServiceImpl.java b/app/server/src/main/java/com/mobtools/server/services/LayoutServiceImpl.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/LayoutServiceImpl.java
rename to app/server/src/main/java/com/mobtools/server/services/LayoutServiceImpl.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/TenantService.java b/app/server/src/main/java/com/mobtools/server/services/TenantService.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/TenantService.java
rename to app/server/src/main/java/com/mobtools/server/services/TenantService.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/TenantServiceImpl.java b/app/server/src/main/java/com/mobtools/server/services/TenantServiceImpl.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/TenantServiceImpl.java
rename to app/server/src/main/java/com/mobtools/server/services/TenantServiceImpl.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/UserService.java b/app/server/src/main/java/com/mobtools/server/services/UserService.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/UserService.java
rename to app/server/src/main/java/com/mobtools/server/services/UserService.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/UserServiceImpl.java b/app/server/src/main/java/com/mobtools/server/services/UserServiceImpl.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/UserServiceImpl.java
rename to app/server/src/main/java/com/mobtools/server/services/UserServiceImpl.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/WidgetService.java b/app/server/src/main/java/com/mobtools/server/services/WidgetService.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/WidgetService.java
rename to app/server/src/main/java/com/mobtools/server/services/WidgetService.java
diff --git a/app/server/server/src/main/java/com/mobtools/server/services/WidgetServiceImpl.java b/app/server/src/main/java/com/mobtools/server/services/WidgetServiceImpl.java
similarity index 100%
rename from app/server/server/src/main/java/com/mobtools/server/services/WidgetServiceImpl.java
rename to app/server/src/main/java/com/mobtools/server/services/WidgetServiceImpl.java
diff --git a/app/server/server/src/main/resources/application-staging.properties b/app/server/src/main/resources/application-staging.properties
similarity index 100%
rename from app/server/server/src/main/resources/application-staging.properties
rename to app/server/src/main/resources/application-staging.properties
diff --git a/app/server/server/src/main/resources/application.properties b/app/server/src/main/resources/application.properties
similarity index 100%
rename from app/server/server/src/main/resources/application.properties
rename to app/server/src/main/resources/application.properties
diff --git a/app/server/server/src/test/java/com/mobtools/server/ServerApplicationTests.java b/app/server/src/test/java/com/mobtools/server/ServerApplicationTests.java
similarity index 100%
rename from app/server/server/src/test/java/com/mobtools/server/ServerApplicationTests.java
rename to app/server/src/test/java/com/mobtools/server/ServerApplicationTests.java