diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f620681..4699c04f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: distribution: "temurin" - name: Build with Maven - run: mvn verify --file skill-tree/pom.xml -P git-build-profile -Dskip-tests=true + run: mvn verify -P git-build-profile -Dskip-tests=true unit-test: name: Unit Tests @@ -33,7 +33,7 @@ jobs: distribution: "temurin" - name: Unit Test - run: mvn test --file skill-tree/pom.xml + run: mvn test integration-test: name: Integration Tests @@ -48,4 +48,4 @@ jobs: distribution: "temurin" - name: Integration Test - run: mvn verify --file skill-tree/pom.xml -Dskip-ut=true + run: mvn verify -Dskip-ut=true diff --git a/.github/workflows/deploy-to-ec2.yml b/.github/workflows/deploy-to-ec2.yml index c7af87a2..346a39b8 100644 --- a/.github/workflows/deploy-to-ec2.yml +++ b/.github/workflows/deploy-to-ec2.yml @@ -29,7 +29,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: skill-tree/Dockerfile + file: Dockerfile platforms: linux/arm64 push: true tags: | diff --git a/skill-tree/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from skill-tree/.mvn/wrapper/maven-wrapper.properties rename to .mvn/wrapper/maven-wrapper.properties diff --git a/skill-tree/Dockerfile b/Dockerfile similarity index 92% rename from skill-tree/Dockerfile rename to Dockerfile index 251f9ab4..31d3f304 100644 --- a/skill-tree/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:17-jdk as build WORKDIR /app -COPY skill-tree . +COPY . . RUN ./mvnw --version RUN ./mvnw clean install -DskipTests diff --git a/skill-tree/docker-compose.yml b/docker-compose.yml similarity index 100% rename from skill-tree/docker-compose.yml rename to docker-compose.yml diff --git a/skill-tree/mvnw b/mvnw old mode 100755 new mode 100644 similarity index 100% rename from skill-tree/mvnw rename to mvnw diff --git a/skill-tree/mvnw.cmd b/mvnw.cmd similarity index 100% rename from skill-tree/mvnw.cmd rename to mvnw.cmd diff --git a/skill-tree/pom.xml b/pom.xml similarity index 100% rename from skill-tree/pom.xml rename to pom.xml diff --git a/skill-tree/.mvn/wrapper/maven-wrapper.jar b/skill-tree/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index cb28b0e3..00000000 Binary files a/skill-tree/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/skill-tree/src/main/java/com/RDS/skilltree/Authentication/AuthEntryPoint.java b/src/main/java/com/RDS/skilltree/Authentication/AuthEntryPoint.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/Authentication/AuthEntryPoint.java rename to src/main/java/com/RDS/skilltree/Authentication/AuthEntryPoint.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/Authentication/CustomAccessDeniedHandler.java b/src/main/java/com/RDS/skilltree/Authentication/CustomAccessDeniedHandler.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/Authentication/CustomAccessDeniedHandler.java rename to src/main/java/com/RDS/skilltree/Authentication/CustomAccessDeniedHandler.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/Authentication/UserAuthenticationToken.java b/src/main/java/com/RDS/skilltree/Authentication/UserAuthenticationToken.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/Authentication/UserAuthenticationToken.java rename to src/main/java/com/RDS/skilltree/Authentication/UserAuthenticationToken.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/SkillTreeApplication.java b/src/main/java/com/RDS/skilltree/SkillTreeApplication.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/SkillTreeApplication.java rename to src/main/java/com/RDS/skilltree/SkillTreeApplication.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/annotations/AuthorizedRoles.java b/src/main/java/com/RDS/skilltree/annotations/AuthorizedRoles.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/annotations/AuthorizedRoles.java rename to src/main/java/com/RDS/skilltree/annotations/AuthorizedRoles.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/apis/EndorsementsApi.java b/src/main/java/com/RDS/skilltree/apis/EndorsementsApi.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/apis/EndorsementsApi.java rename to src/main/java/com/RDS/skilltree/apis/EndorsementsApi.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/apis/HealthApi.java b/src/main/java/com/RDS/skilltree/apis/HealthApi.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/apis/HealthApi.java rename to src/main/java/com/RDS/skilltree/apis/HealthApi.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/apis/SkillsApi.java b/src/main/java/com/RDS/skilltree/apis/SkillsApi.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/apis/SkillsApi.java rename to src/main/java/com/RDS/skilltree/apis/SkillsApi.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/aspects/AuthorizedRolesAspect.java b/src/main/java/com/RDS/skilltree/aspects/AuthorizedRolesAspect.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/aspects/AuthorizedRolesAspect.java rename to src/main/java/com/RDS/skilltree/aspects/AuthorizedRolesAspect.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/config/AppConfig.java b/src/main/java/com/RDS/skilltree/config/AppConfig.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/config/AppConfig.java rename to src/main/java/com/RDS/skilltree/config/AppConfig.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/config/SecurityConfig.java b/src/main/java/com/RDS/skilltree/config/SecurityConfig.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/config/SecurityConfig.java rename to src/main/java/com/RDS/skilltree/config/SecurityConfig.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/config/WebMvcConfig.java b/src/main/java/com/RDS/skilltree/config/WebMvcConfig.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/config/WebMvcConfig.java rename to src/main/java/com/RDS/skilltree/config/WebMvcConfig.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/dtos/CreateEndorsementRequestDto.java b/src/main/java/com/RDS/skilltree/dtos/CreateEndorsementRequestDto.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/dtos/CreateEndorsementRequestDto.java rename to src/main/java/com/RDS/skilltree/dtos/CreateEndorsementRequestDto.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/dtos/RdsGetUserDetailsResDto.java b/src/main/java/com/RDS/skilltree/dtos/RdsGetUserDetailsResDto.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/dtos/RdsGetUserDetailsResDto.java rename to src/main/java/com/RDS/skilltree/dtos/RdsGetUserDetailsResDto.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/dtos/SkillRequestActionRequestDto.java b/src/main/java/com/RDS/skilltree/dtos/SkillRequestActionRequestDto.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/dtos/SkillRequestActionRequestDto.java rename to src/main/java/com/RDS/skilltree/dtos/SkillRequestActionRequestDto.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/dtos/SkillRequestsDto.java b/src/main/java/com/RDS/skilltree/dtos/SkillRequestsDto.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/dtos/SkillRequestsDto.java rename to src/main/java/com/RDS/skilltree/dtos/SkillRequestsDto.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/enums/SkillTypeEnum.java b/src/main/java/com/RDS/skilltree/enums/SkillTypeEnum.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/enums/SkillTypeEnum.java rename to src/main/java/com/RDS/skilltree/enums/SkillTypeEnum.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/enums/UserRoleEnum.java b/src/main/java/com/RDS/skilltree/enums/UserRoleEnum.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/enums/UserRoleEnum.java rename to src/main/java/com/RDS/skilltree/enums/UserRoleEnum.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/enums/UserSkillStatusEnum.java b/src/main/java/com/RDS/skilltree/enums/UserSkillStatusEnum.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/enums/UserSkillStatusEnum.java rename to src/main/java/com/RDS/skilltree/enums/UserSkillStatusEnum.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/EndorsementNotFoundException.java b/src/main/java/com/RDS/skilltree/exceptions/EndorsementNotFoundException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/EndorsementNotFoundException.java rename to src/main/java/com/RDS/skilltree/exceptions/EndorsementNotFoundException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/EntityAlreadyExistsException.java b/src/main/java/com/RDS/skilltree/exceptions/EntityAlreadyExistsException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/EntityAlreadyExistsException.java rename to src/main/java/com/RDS/skilltree/exceptions/EntityAlreadyExistsException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/ForbiddenException.java b/src/main/java/com/RDS/skilltree/exceptions/ForbiddenException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/ForbiddenException.java rename to src/main/java/com/RDS/skilltree/exceptions/ForbiddenException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/GlobalExceptionHandler.java b/src/main/java/com/RDS/skilltree/exceptions/GlobalExceptionHandler.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/GlobalExceptionHandler.java rename to src/main/java/com/RDS/skilltree/exceptions/GlobalExceptionHandler.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/InternalServerErrorException.java b/src/main/java/com/RDS/skilltree/exceptions/InternalServerErrorException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/InternalServerErrorException.java rename to src/main/java/com/RDS/skilltree/exceptions/InternalServerErrorException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/InvalidParameterException.java b/src/main/java/com/RDS/skilltree/exceptions/InvalidParameterException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/InvalidParameterException.java rename to src/main/java/com/RDS/skilltree/exceptions/InvalidParameterException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/NoEntityException.java b/src/main/java/com/RDS/skilltree/exceptions/NoEntityException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/NoEntityException.java rename to src/main/java/com/RDS/skilltree/exceptions/NoEntityException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/SelfEndorsementNotAllowedException.java b/src/main/java/com/RDS/skilltree/exceptions/SelfEndorsementNotAllowedException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/SelfEndorsementNotAllowedException.java rename to src/main/java/com/RDS/skilltree/exceptions/SelfEndorsementNotAllowedException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/SkillAlreadyExistsException.java b/src/main/java/com/RDS/skilltree/exceptions/SkillAlreadyExistsException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/SkillAlreadyExistsException.java rename to src/main/java/com/RDS/skilltree/exceptions/SkillAlreadyExistsException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/SkillNotFoundException.java b/src/main/java/com/RDS/skilltree/exceptions/SkillNotFoundException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/SkillNotFoundException.java rename to src/main/java/com/RDS/skilltree/exceptions/SkillNotFoundException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/exceptions/UserNotFoundException.java b/src/main/java/com/RDS/skilltree/exceptions/UserNotFoundException.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/exceptions/UserNotFoundException.java rename to src/main/java/com/RDS/skilltree/exceptions/UserNotFoundException.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/models/Endorsement.java b/src/main/java/com/RDS/skilltree/models/Endorsement.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/models/Endorsement.java rename to src/main/java/com/RDS/skilltree/models/Endorsement.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/models/JwtUser.java b/src/main/java/com/RDS/skilltree/models/JwtUser.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/models/JwtUser.java rename to src/main/java/com/RDS/skilltree/models/JwtUser.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/models/Skill.java b/src/main/java/com/RDS/skilltree/models/Skill.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/models/Skill.java rename to src/main/java/com/RDS/skilltree/models/Skill.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/models/UserSkills.java b/src/main/java/com/RDS/skilltree/models/UserSkills.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/models/UserSkills.java rename to src/main/java/com/RDS/skilltree/models/UserSkills.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/repositories/EndorsementRepository.java b/src/main/java/com/RDS/skilltree/repositories/EndorsementRepository.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/repositories/EndorsementRepository.java rename to src/main/java/com/RDS/skilltree/repositories/EndorsementRepository.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/repositories/SkillRepository.java b/src/main/java/com/RDS/skilltree/repositories/SkillRepository.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/repositories/SkillRepository.java rename to src/main/java/com/RDS/skilltree/repositories/SkillRepository.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/repositories/UserSkillRepository.java b/src/main/java/com/RDS/skilltree/repositories/UserSkillRepository.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/repositories/UserSkillRepository.java rename to src/main/java/com/RDS/skilltree/repositories/UserSkillRepository.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/services/EndorsementService.java b/src/main/java/com/RDS/skilltree/services/EndorsementService.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/services/EndorsementService.java rename to src/main/java/com/RDS/skilltree/services/EndorsementService.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/services/EndorsementServiceImplementation.java b/src/main/java/com/RDS/skilltree/services/EndorsementServiceImplementation.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/services/EndorsementServiceImplementation.java rename to src/main/java/com/RDS/skilltree/services/EndorsementServiceImplementation.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/services/MetricService.java b/src/main/java/com/RDS/skilltree/services/MetricService.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/services/MetricService.java rename to src/main/java/com/RDS/skilltree/services/MetricService.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/services/MetricServiceImplementation.java b/src/main/java/com/RDS/skilltree/services/MetricServiceImplementation.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/services/MetricServiceImplementation.java rename to src/main/java/com/RDS/skilltree/services/MetricServiceImplementation.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/services/SkillService.java b/src/main/java/com/RDS/skilltree/services/SkillService.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/services/SkillService.java rename to src/main/java/com/RDS/skilltree/services/SkillService.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/services/SkillServiceImplementation.java b/src/main/java/com/RDS/skilltree/services/SkillServiceImplementation.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/services/SkillServiceImplementation.java rename to src/main/java/com/RDS/skilltree/services/SkillServiceImplementation.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/services/external/RdsService.java b/src/main/java/com/RDS/skilltree/services/external/RdsService.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/services/external/RdsService.java rename to src/main/java/com/RDS/skilltree/services/external/RdsService.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/services/external/RdsServiceImplementation.java b/src/main/java/com/RDS/skilltree/services/external/RdsServiceImplementation.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/services/external/RdsServiceImplementation.java rename to src/main/java/com/RDS/skilltree/services/external/RdsServiceImplementation.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/utils/CommonUtils.java b/src/main/java/com/RDS/skilltree/utils/CommonUtils.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/utils/CommonUtils.java rename to src/main/java/com/RDS/skilltree/utils/CommonUtils.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/utils/GenericResponse.java b/src/main/java/com/RDS/skilltree/utils/GenericResponse.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/utils/GenericResponse.java rename to src/main/java/com/RDS/skilltree/utils/GenericResponse.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/utils/JWTAuthenticationFilter.java b/src/main/java/com/RDS/skilltree/utils/JWTAuthenticationFilter.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/utils/JWTAuthenticationFilter.java rename to src/main/java/com/RDS/skilltree/utils/JWTAuthenticationFilter.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/utils/JWTUtils.java b/src/main/java/com/RDS/skilltree/utils/JWTUtils.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/utils/JWTUtils.java rename to src/main/java/com/RDS/skilltree/utils/JWTUtils.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/utils/MessageResponse.java b/src/main/java/com/RDS/skilltree/utils/MessageResponse.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/utils/MessageResponse.java rename to src/main/java/com/RDS/skilltree/utils/MessageResponse.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/utils/TrackedProperties.java b/src/main/java/com/RDS/skilltree/utils/TrackedProperties.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/utils/TrackedProperties.java rename to src/main/java/com/RDS/skilltree/utils/TrackedProperties.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/utils/UUIDValidationInterceptor.java b/src/main/java/com/RDS/skilltree/utils/UUIDValidationInterceptor.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/utils/UUIDValidationInterceptor.java rename to src/main/java/com/RDS/skilltree/utils/UUIDValidationInterceptor.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/AuthSuccessViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/AuthSuccessViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/AuthSuccessViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/AuthSuccessViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/CreateEndorsementViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/CreateEndorsementViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/CreateEndorsementViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/CreateEndorsementViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/CreateSkillViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/CreateSkillViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/CreateSkillViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/CreateSkillViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/EndorsementViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/EndorsementViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/EndorsementViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/EndorsementViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/MinimalEndorsementViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/MinimalEndorsementViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/MinimalEndorsementViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/MinimalEndorsementViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/RdsUserViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/RdsUserViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/RdsUserViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/RdsUserViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/SkillRequestViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/SkillRequestViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/SkillRequestViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/SkillRequestViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/SkillRequestsWithUserDetailsViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/SkillRequestsWithUserDetailsViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/SkillRequestsWithUserDetailsViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/SkillRequestsWithUserDetailsViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/SkillViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/SkillViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/SkillViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/SkillViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/UpdateEndorsementViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/UpdateEndorsementViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/UpdateEndorsementViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/UpdateEndorsementViewModel.java diff --git a/skill-tree/src/main/java/com/RDS/skilltree/viewmodels/UserViewModel.java b/src/main/java/com/RDS/skilltree/viewmodels/UserViewModel.java similarity index 100% rename from skill-tree/src/main/java/com/RDS/skilltree/viewmodels/UserViewModel.java rename to src/main/java/com/RDS/skilltree/viewmodels/UserViewModel.java diff --git a/skill-tree/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties similarity index 100% rename from skill-tree/src/main/resources/application-dev.properties rename to src/main/resources/application-dev.properties diff --git a/skill-tree/src/main/resources/application-production.properties b/src/main/resources/application-production.properties similarity index 100% rename from skill-tree/src/main/resources/application-production.properties rename to src/main/resources/application-production.properties diff --git a/skill-tree/src/main/resources/application-staging.properties b/src/main/resources/application-staging.properties similarity index 100% rename from skill-tree/src/main/resources/application-staging.properties rename to src/main/resources/application-staging.properties diff --git a/skill-tree/src/main/resources/application-test.properties b/src/main/resources/application-test.properties similarity index 100% rename from skill-tree/src/main/resources/application-test.properties rename to src/main/resources/application-test.properties diff --git a/skill-tree/src/main/resources/application.properties b/src/main/resources/application.properties similarity index 100% rename from skill-tree/src/main/resources/application.properties rename to src/main/resources/application.properties diff --git a/skill-tree/src/main/resources/db/migrations/V1__initial_setup.sql b/src/main/resources/db/migrations/V1__initial_setup.sql similarity index 100% rename from skill-tree/src/main/resources/db/migrations/V1__initial_setup.sql rename to src/main/resources/db/migrations/V1__initial_setup.sql diff --git a/skill-tree/src/main/resources/logback-test.xml b/src/main/resources/logback-test.xml similarity index 100% rename from skill-tree/src/main/resources/logback-test.xml rename to src/main/resources/logback-test.xml diff --git a/skill-tree/src/test/java/com/RDS/skilltree/SkillTreeApplicationTests.java b/src/test/java/com/RDS/skilltree/SkillTreeApplicationTests.java similarity index 100% rename from skill-tree/src/test/java/com/RDS/skilltree/SkillTreeApplicationTests.java rename to src/test/java/com/RDS/skilltree/SkillTreeApplicationTests.java diff --git a/skill-tree/src/test/java/com/RDS/skilltree/TestContainerManager.java b/src/test/java/com/RDS/skilltree/TestContainerManager.java similarity index 100% rename from skill-tree/src/test/java/com/RDS/skilltree/TestContainerManager.java rename to src/test/java/com/RDS/skilltree/TestContainerManager.java diff --git a/skill-tree/src/test/java/com/RDS/skilltree/integration/skills/CreateSkillIntegrationTest.java b/src/test/java/com/RDS/skilltree/integration/skills/CreateSkillIntegrationTest.java similarity index 100% rename from skill-tree/src/test/java/com/RDS/skilltree/integration/skills/CreateSkillIntegrationTest.java rename to src/test/java/com/RDS/skilltree/integration/skills/CreateSkillIntegrationTest.java diff --git a/skill-tree/src/test/java/com/RDS/skilltree/integration/skills/GetAllSkillRequestIntegrationTest.java b/src/test/java/com/RDS/skilltree/integration/skills/GetAllSkillRequestIntegrationTest.java similarity index 100% rename from skill-tree/src/test/java/com/RDS/skilltree/integration/skills/GetAllSkillRequestIntegrationTest.java rename to src/test/java/com/RDS/skilltree/integration/skills/GetAllSkillRequestIntegrationTest.java diff --git a/skill-tree/src/test/java/com/RDS/skilltree/integration/skills/GetAllSkillsIntegrationTest.java b/src/test/java/com/RDS/skilltree/integration/skills/GetAllSkillsIntegrationTest.java similarity index 100% rename from skill-tree/src/test/java/com/RDS/skilltree/integration/skills/GetAllSkillsIntegrationTest.java rename to src/test/java/com/RDS/skilltree/integration/skills/GetAllSkillsIntegrationTest.java diff --git a/skill-tree/src/test/java/com/RDS/skilltree/integration/skills/GetEndorsementsBySkillIdIntegrationTest.java b/src/test/java/com/RDS/skilltree/integration/skills/GetEndorsementsBySkillIdIntegrationTest.java similarity index 100% rename from skill-tree/src/test/java/com/RDS/skilltree/integration/skills/GetEndorsementsBySkillIdIntegrationTest.java rename to src/test/java/com/RDS/skilltree/integration/skills/GetEndorsementsBySkillIdIntegrationTest.java diff --git a/skill-tree/src/test/java/com/RDS/skilltree/integration/skills/SkillRequestActionIntegrationTest.java b/src/test/java/com/RDS/skilltree/integration/skills/SkillRequestActionIntegrationTest.java similarity index 100% rename from skill-tree/src/test/java/com/RDS/skilltree/integration/skills/SkillRequestActionIntegrationTest.java rename to src/test/java/com/RDS/skilltree/integration/skills/SkillRequestActionIntegrationTest.java diff --git a/skill-tree/src/test/java/com/RDS/skilltree/unit/utils/UUIDValidationInterceptorTest.java b/src/test/java/com/RDS/skilltree/unit/utils/UUIDValidationInterceptorTest.java similarity index 100% rename from skill-tree/src/test/java/com/RDS/skilltree/unit/utils/UUIDValidationInterceptorTest.java rename to src/test/java/com/RDS/skilltree/unit/utils/UUIDValidationInterceptorTest.java diff --git a/skill-tree/src/test/java/utils/CustomResultMatchers.java b/src/test/java/utils/CustomResultMatchers.java similarity index 100% rename from skill-tree/src/test/java/utils/CustomResultMatchers.java rename to src/test/java/utils/CustomResultMatchers.java diff --git a/skill-tree/src/test/java/utils/CustomSecurityContextFactory.java b/src/test/java/utils/CustomSecurityContextFactory.java similarity index 100% rename from skill-tree/src/test/java/utils/CustomSecurityContextFactory.java rename to src/test/java/utils/CustomSecurityContextFactory.java diff --git a/skill-tree/src/test/java/utils/RestAPIHelper.java b/src/test/java/utils/RestAPIHelper.java similarity index 100% rename from skill-tree/src/test/java/utils/RestAPIHelper.java rename to src/test/java/utils/RestAPIHelper.java diff --git a/skill-tree/src/test/java/utils/TestDataHelper.java b/src/test/java/utils/TestDataHelper.java similarity index 100% rename from skill-tree/src/test/java/utils/TestDataHelper.java rename to src/test/java/utils/TestDataHelper.java diff --git a/skill-tree/src/test/java/utils/WithCustomMockUser.java b/src/test/java/utils/WithCustomMockUser.java similarity index 100% rename from skill-tree/src/test/java/utils/WithCustomMockUser.java rename to src/test/java/utils/WithCustomMockUser.java