diff --git a/jhipster/README.md b/jhipster-modules/README.md
similarity index 100%
rename from jhipster/README.md
rename to jhipster-modules/README.md
diff --git a/jhipster/jhipster-microservice/README.md b/jhipster-modules/jhipster-microservice/README.md
similarity index 100%
rename from jhipster/jhipster-microservice/README.md
rename to jhipster-modules/jhipster-microservice/README.md
diff --git a/jhipster/jhipster-microservice/car-app/.editorconfig b/jhipster-modules/jhipster-microservice/car-app/.editorconfig
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/.editorconfig
rename to jhipster-modules/jhipster-microservice/car-app/.editorconfig
diff --git a/jhipster/jhipster-microservice/car-app/.gitattributes b/jhipster-modules/jhipster-microservice/car-app/.gitattributes
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/.gitattributes
rename to jhipster-modules/jhipster-microservice/car-app/.gitattributes
diff --git a/jhipster/jhipster-microservice/car-app/.gitignore b/jhipster-modules/jhipster-microservice/car-app/.gitignore
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/.gitignore
rename to jhipster-modules/jhipster-microservice/car-app/.gitignore
diff --git a/jhipster/jhipster-microservice/car-app/.jhipster/Car.json b/jhipster-modules/jhipster-microservice/car-app/.jhipster/Car.json
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/.jhipster/Car.json
rename to jhipster-modules/jhipster-microservice/car-app/.jhipster/Car.json
diff --git a/jhipster/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.jar
rename to jhipster-modules/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/jhipster/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.properties
rename to jhipster-modules/jhipster-microservice/car-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/jhipster/jhipster-microservice/car-app/.yo-rc.json b/jhipster-modules/jhipster-microservice/car-app/.yo-rc.json
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/.yo-rc.json
rename to jhipster-modules/jhipster-microservice/car-app/.yo-rc.json
diff --git a/jhipster/jhipster-microservice/car-app/README.md b/jhipster-modules/jhipster-microservice/car-app/README.md
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/README.md
rename to jhipster-modules/jhipster-microservice/car-app/README.md
diff --git a/jhipster/jhipster-microservice/car-app/mvnw b/jhipster-modules/jhipster-microservice/car-app/mvnw
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/mvnw
rename to jhipster-modules/jhipster-microservice/car-app/mvnw
diff --git a/jhipster/jhipster-microservice/car-app/mvnw.cmd b/jhipster-modules/jhipster-microservice/car-app/mvnw.cmd
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/mvnw.cmd
rename to jhipster-modules/jhipster-microservice/car-app/mvnw.cmd
diff --git a/jhipster/jhipster-microservice/car-app/package.json b/jhipster-modules/jhipster-microservice/car-app/package.json
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/package.json
rename to jhipster-modules/jhipster-microservice/car-app/package.json
diff --git a/jhipster/jhipster-microservice/car-app/pom.xml b/jhipster-modules/jhipster-microservice/car-app/pom.xml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/pom.xml
rename to jhipster-modules/jhipster-microservice/car-app/pom.xml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/Dockerfile b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/Dockerfile
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/docker/Dockerfile
rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/Dockerfile
diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/app.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/app.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/docker/app.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/app.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/README.md
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/README.md
rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/README.md
diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/docker-config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/docker-config/application.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/docker-config/application.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/localhost-config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/docker/central-server-config/localhost-config/application.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/central-server-config/localhost-config/application.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/jhipster-registry.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/docker/jhipster-registry.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/jhipster-registry.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/mysql.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/mysql.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/docker/mysql.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/mysql.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/docker/sonar.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/docker/sonar.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/docker/sonar.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/docker/sonar.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/ApplicationWebXml.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/ApplicationWebXml.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/ApplicationWebXml.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/ApplicationWebXml.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/CarappApp.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/CarappApp.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/CarappApp.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/CarappApp.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/aop/logging/LoggingAspect.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/aop/logging/LoggingAspect.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/aop/logging/LoggingAspect.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/ApplicationProperties.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/ApplicationProperties.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/ApplicationProperties.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/ApplicationProperties.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/AsyncConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/AsyncConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/AsyncConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/AsyncConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/CacheConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/CacheConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/CacheConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/CacheConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/CloudDatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/CloudDatabaseConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/CloudDatabaseConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/Constants.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/Constants.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/Constants.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/Constants.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DatabaseConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DatabaseConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DateTimeFormatConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DateTimeFormatConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DateTimeFormatConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DefaultProfileUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/DefaultProfileUtil.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/DefaultProfileUtil.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LocaleConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LocaleConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LocaleConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LocaleConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingAspectConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingAspectConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingAspectConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/LoggingConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/MetricsConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/MetricsConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/MetricsConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/MetricsConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/MicroserviceSecurityConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/MicroserviceSecurityConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/MicroserviceSecurityConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/MicroserviceSecurityConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/ThymeleafConfiguration.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/ThymeleafConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/ThymeleafConfiguration.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/ThymeleafConfiguration.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/WebConfigurer.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/WebConfigurer.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/WebConfigurer.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/WebConfigurer.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/AuditEventConverter.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/AuditEventConverter.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/AuditEventConverter.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/package-info.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/audit/package-info.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/config/package-info.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/config/package-info.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/AbstractAuditingEntity.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/AbstractAuditingEntity.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/AbstractAuditingEntity.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/Car.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/Car.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/Car.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/Car.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/PersistentAuditEvent.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/PersistentAuditEvent.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/PersistentAuditEvent.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/domain/package-info.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/domain/package-info.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/repository/CarRepository.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/repository/CarRepository.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/repository/CarRepository.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/repository/CarRepository.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/repository/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/repository/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/repository/package-info.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/repository/package-info.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/AuthoritiesConstants.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/AuthoritiesConstants.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/AuthoritiesConstants.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/SecurityUtils.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/SecurityUtils.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/SecurityUtils.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/SecurityUtils.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/SpringSecurityAuditorAware.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/SpringSecurityAuditorAware.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/SpringSecurityAuditorAware.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTConfigurer.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTConfigurer.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTConfigurer.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTConfigurer.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTFilter.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTFilter.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTFilter.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/JWTFilter.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/TokenProvider.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/TokenProvider.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/TokenProvider.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/security/jwt/TokenProvider.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/service/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/service/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/service/package-info.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/service/package-info.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/CarResource.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/CarResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/CarResource.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/CarResource.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/LogsResource.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/LogsResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/LogsResource.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/LogsResource.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/ProfileInfoResource.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/ProfileInfoResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/ProfileInfoResource.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/ProfileInfoResource.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/CustomParameterizedException.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/CustomParameterizedException.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/CustomParameterizedException.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorConstants.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorConstants.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorConstants.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorVM.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorVM.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ErrorVM.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ExceptionTranslator.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ExceptionTranslator.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ExceptionTranslator.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/FieldErrorVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/FieldErrorVM.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/FieldErrorVM.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ParameterizedErrorVM.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ParameterizedErrorVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ParameterizedErrorVM.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/errors/ParameterizedErrorVM.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/package-info.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/package-info.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/HeaderUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/HeaderUtil.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/HeaderUtil.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/PaginationUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/PaginationUtil.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/util/PaginationUtil.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/LoggerVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/LoggerVM.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/LoggerVM.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/package-info.java b/jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/package-info.java
rename to jhipster-modules/jhipster-microservice/car-app/src/main/java/com/car/app/web/rest/vm/package-info.java
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/.h2.server.properties
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/.h2.server.properties
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/.h2.server.properties
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/banner.txt b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/banner.txt
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/banner.txt
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/banner.txt
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application-dev.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/application-dev.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application-dev.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application-prod.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/application-prod.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application-prod.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/application.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/application.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/application.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/bootstrap-prod.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/bootstrap-prod.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/bootstrap-prod.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/20170503041524_added_entity_Car.xml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/20170503041524_added_entity_Car.xml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/20170503041524_added_entity_Car.xml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/changelog/20170503041524_added_entity_Car.xml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/master.xml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/config/liquibase/master.xml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/config/liquibase/master.xml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/i18n/messages.properties
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/i18n/messages.properties
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/i18n/messages.properties
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/logback-spring.xml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/logback-spring.xml
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/logback-spring.xml
diff --git a/jhipster/jhipster-microservice/car-app/src/main/resources/templates/error.html b/jhipster-modules/jhipster-microservice/car-app/src/main/resources/templates/error.html
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/main/resources/templates/error.html
rename to jhipster-modules/jhipster-microservice/car-app/src/main/resources/templates/error.html
diff --git a/jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/TestUtil.java b/jhipster-modules/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/TestUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/TestUtil.java
rename to jhipster-modules/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/TestUtil.java
diff --git a/jhipster/jhipster-microservice/car-app/src/test/resources/config/application.yml b/jhipster-modules/jhipster-microservice/car-app/src/test/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/test/resources/config/application.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/test/resources/config/application.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/car-app/src/test/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/test/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-microservice/car-app/src/test/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-microservice/car-app/src/test/resources/logback-test.xml b/jhipster-modules/jhipster-microservice/car-app/src/test/resources/logback-test.xml
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/src/test/resources/logback-test.xml
rename to jhipster-modules/jhipster-microservice/car-app/src/test/resources/logback-test.xml
diff --git a/jhipster/jhipster-microservice/car-app/yarn.lock b/jhipster-modules/jhipster-microservice/car-app/yarn.lock
similarity index 100%
rename from jhipster/jhipster-microservice/car-app/yarn.lock
rename to jhipster-modules/jhipster-microservice/car-app/yarn.lock
diff --git a/jhipster/jhipster-microservice/dealer-app/.editorconfig b/jhipster-modules/jhipster-microservice/dealer-app/.editorconfig
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/.editorconfig
rename to jhipster-modules/jhipster-microservice/dealer-app/.editorconfig
diff --git a/jhipster/jhipster-microservice/dealer-app/.gitattributes b/jhipster-modules/jhipster-microservice/dealer-app/.gitattributes
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/.gitattributes
rename to jhipster-modules/jhipster-microservice/dealer-app/.gitattributes
diff --git a/jhipster/jhipster-microservice/dealer-app/.gitignore b/jhipster-modules/jhipster-microservice/dealer-app/.gitignore
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/.gitignore
rename to jhipster-modules/jhipster-microservice/dealer-app/.gitignore
diff --git a/jhipster/jhipster-microservice/dealer-app/.jhipster/Dealer.json b/jhipster-modules/jhipster-microservice/dealer-app/.jhipster/Dealer.json
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/.jhipster/Dealer.json
rename to jhipster-modules/jhipster-microservice/dealer-app/.jhipster/Dealer.json
diff --git a/jhipster/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.jar
rename to jhipster-modules/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/jhipster/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.properties
rename to jhipster-modules/jhipster-microservice/dealer-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/jhipster/jhipster-microservice/dealer-app/.yo-rc.json b/jhipster-modules/jhipster-microservice/dealer-app/.yo-rc.json
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/.yo-rc.json
rename to jhipster-modules/jhipster-microservice/dealer-app/.yo-rc.json
diff --git a/jhipster/jhipster-microservice/dealer-app/README.md b/jhipster-modules/jhipster-microservice/dealer-app/README.md
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/README.md
rename to jhipster-modules/jhipster-microservice/dealer-app/README.md
diff --git a/jhipster/jhipster-microservice/dealer-app/mvnw b/jhipster-modules/jhipster-microservice/dealer-app/mvnw
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/mvnw
rename to jhipster-modules/jhipster-microservice/dealer-app/mvnw
diff --git a/jhipster/jhipster-microservice/dealer-app/mvnw.cmd b/jhipster-modules/jhipster-microservice/dealer-app/mvnw.cmd
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/mvnw.cmd
rename to jhipster-modules/jhipster-microservice/dealer-app/mvnw.cmd
diff --git a/jhipster/jhipster-microservice/dealer-app/package.json b/jhipster-modules/jhipster-microservice/dealer-app/package.json
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/package.json
rename to jhipster-modules/jhipster-microservice/dealer-app/package.json
diff --git a/jhipster/jhipster-microservice/dealer-app/pom.xml b/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/pom.xml
rename to jhipster-modules/jhipster-microservice/dealer-app/pom.xml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/Dockerfile b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/Dockerfile
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/Dockerfile
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/Dockerfile
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/app.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/app.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/app.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/app.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/README.md
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/README.md
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/README.md
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/docker-config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/docker-config/application.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/docker-config/application.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/localhost-config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/central-server-config/localhost-config/application.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/central-server-config/localhost-config/application.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/jhipster-registry.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/jhipster-registry.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/jhipster-registry.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/mysql.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/mysql.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/mysql.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/mysql.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/docker/sonar.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/sonar.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/docker/sonar.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/docker/sonar.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/ApplicationWebXml.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/ApplicationWebXml.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/ApplicationWebXml.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/ApplicationWebXml.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/DealerappApp.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/DealerappApp.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/DealerappApp.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/DealerappApp.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/aop/logging/LoggingAspect.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/aop/logging/LoggingAspect.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/aop/logging/LoggingAspect.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ApplicationProperties.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ApplicationProperties.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ApplicationProperties.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ApplicationProperties.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/AsyncConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/AsyncConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/AsyncConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/AsyncConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CacheConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CacheConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CacheConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CacheConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CloudDatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CloudDatabaseConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/CloudDatabaseConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/Constants.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/Constants.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/Constants.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/Constants.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DatabaseConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DatabaseConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DateTimeFormatConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DateTimeFormatConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DateTimeFormatConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DefaultProfileUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DefaultProfileUtil.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/DefaultProfileUtil.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LocaleConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LocaleConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LocaleConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LocaleConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingAspectConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingAspectConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingAspectConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/LoggingConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MetricsConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MetricsConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MetricsConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MetricsConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MicroserviceSecurityConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MicroserviceSecurityConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MicroserviceSecurityConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/MicroserviceSecurityConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ThymeleafConfiguration.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ThymeleafConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ThymeleafConfiguration.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/ThymeleafConfiguration.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/WebConfigurer.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/WebConfigurer.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/WebConfigurer.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/WebConfigurer.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/AuditEventConverter.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/AuditEventConverter.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/AuditEventConverter.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/package-info.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/audit/package-info.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/package-info.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/config/package-info.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/AbstractAuditingEntity.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/AbstractAuditingEntity.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/AbstractAuditingEntity.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/Dealer.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/Dealer.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/Dealer.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/Dealer.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/PersistentAuditEvent.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/PersistentAuditEvent.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/PersistentAuditEvent.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/package-info.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/domain/package-info.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/DealerRepository.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/DealerRepository.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/DealerRepository.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/DealerRepository.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/package-info.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/repository/package-info.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/AuthoritiesConstants.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/AuthoritiesConstants.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/AuthoritiesConstants.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SecurityUtils.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SecurityUtils.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SecurityUtils.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SecurityUtils.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SpringSecurityAuditorAware.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SpringSecurityAuditorAware.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/SpringSecurityAuditorAware.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTConfigurer.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTConfigurer.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTConfigurer.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTConfigurer.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTFilter.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTFilter.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTFilter.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/JWTFilter.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/TokenProvider.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/TokenProvider.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/TokenProvider.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/security/jwt/TokenProvider.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/service/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/service/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/service/package-info.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/service/package-info.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/DealerResource.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/DealerResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/DealerResource.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/DealerResource.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/LogsResource.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/LogsResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/LogsResource.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/LogsResource.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/ProfileInfoResource.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/ProfileInfoResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/ProfileInfoResource.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/ProfileInfoResource.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/CustomParameterizedException.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/CustomParameterizedException.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/CustomParameterizedException.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorConstants.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorConstants.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorConstants.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorVM.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorVM.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ErrorVM.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ExceptionTranslator.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ExceptionTranslator.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ExceptionTranslator.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/FieldErrorVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/FieldErrorVM.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/FieldErrorVM.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ParameterizedErrorVM.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ParameterizedErrorVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ParameterizedErrorVM.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/errors/ParameterizedErrorVM.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/package-info.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/package-info.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/HeaderUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/HeaderUtil.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/HeaderUtil.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/PaginationUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/PaginationUtil.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/util/PaginationUtil.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/LoggerVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/LoggerVM.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/LoggerVM.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/package-info.java b/jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/package-info.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/java/com/dealer/app/web/rest/vm/package-info.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/.h2.server.properties
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/.h2.server.properties
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/.h2.server.properties
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/banner.txt b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/banner.txt
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/banner.txt
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/banner.txt
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application-dev.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application-dev.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application-dev.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application-prod.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application-prod.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application-prod.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/application.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/application.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap-prod.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap-prod.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap-prod.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/20170503044952_added_entity_Dealer.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/20170503044952_added_entity_Dealer.xml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/20170503044952_added_entity_Dealer.xml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/changelog/20170503044952_added_entity_Dealer.xml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/master.xml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/master.xml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/config/liquibase/master.xml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/i18n/messages.properties
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/i18n/messages.properties
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/i18n/messages.properties
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/logback-spring.xml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/logback-spring.xml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/logback-spring.xml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/main/resources/templates/error.html b/jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/templates/error.html
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/main/resources/templates/error.html
rename to jhipster-modules/jhipster-microservice/dealer-app/src/main/resources/templates/error.html
diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/TestUtil.java b/jhipster-modules/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/TestUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/TestUtil.java
rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/TestUtil.java
diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/resources/config/application.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/test/resources/config/application.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/config/application.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/test/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/resources/logback-test.xml b/jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/logback-test.xml
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/src/test/resources/logback-test.xml
rename to jhipster-modules/jhipster-microservice/dealer-app/src/test/resources/logback-test.xml
diff --git a/jhipster/jhipster-microservice/dealer-app/yarn.lock b/jhipster-modules/jhipster-microservice/dealer-app/yarn.lock
similarity index 100%
rename from jhipster/jhipster-microservice/dealer-app/yarn.lock
rename to jhipster-modules/jhipster-microservice/dealer-app/yarn.lock
diff --git a/jhipster/jhipster-microservice/gateway-app/.bowerrc b/jhipster-modules/jhipster-microservice/gateway-app/.bowerrc
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.bowerrc
rename to jhipster-modules/jhipster-microservice/gateway-app/.bowerrc
diff --git a/jhipster/jhipster-microservice/gateway-app/.editorconfig b/jhipster-modules/jhipster-microservice/gateway-app/.editorconfig
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.editorconfig
rename to jhipster-modules/jhipster-microservice/gateway-app/.editorconfig
diff --git a/jhipster/jhipster-microservice/gateway-app/.eslintignore b/jhipster-modules/jhipster-microservice/gateway-app/.eslintignore
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.eslintignore
rename to jhipster-modules/jhipster-microservice/gateway-app/.eslintignore
diff --git a/jhipster/jhipster-microservice/gateway-app/.eslintrc.json b/jhipster-modules/jhipster-microservice/gateway-app/.eslintrc.json
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.eslintrc.json
rename to jhipster-modules/jhipster-microservice/gateway-app/.eslintrc.json
diff --git a/jhipster/jhipster-microservice/gateway-app/.gitattributes b/jhipster-modules/jhipster-microservice/gateway-app/.gitattributes
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.gitattributes
rename to jhipster-modules/jhipster-microservice/gateway-app/.gitattributes
diff --git a/jhipster/jhipster-microservice/gateway-app/.gitignore b/jhipster-modules/jhipster-microservice/gateway-app/.gitignore
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.gitignore
rename to jhipster-modules/jhipster-microservice/gateway-app/.gitignore
diff --git a/jhipster/jhipster-microservice/gateway-app/.jhipster/Car.json b/jhipster-modules/jhipster-microservice/gateway-app/.jhipster/Car.json
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.jhipster/Car.json
rename to jhipster-modules/jhipster-microservice/gateway-app/.jhipster/Car.json
diff --git a/jhipster/jhipster-microservice/gateway-app/.jhipster/Dealer.json b/jhipster-modules/jhipster-microservice/gateway-app/.jhipster/Dealer.json
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.jhipster/Dealer.json
rename to jhipster-modules/jhipster-microservice/gateway-app/.jhipster/Dealer.json
diff --git a/jhipster/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.jar
rename to jhipster-modules/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/jhipster/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.properties
rename to jhipster-modules/jhipster-microservice/gateway-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/jhipster/jhipster-microservice/gateway-app/.yo-rc.json b/jhipster-modules/jhipster-microservice/gateway-app/.yo-rc.json
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/.yo-rc.json
rename to jhipster-modules/jhipster-microservice/gateway-app/.yo-rc.json
diff --git a/jhipster/jhipster-microservice/gateway-app/README.md b/jhipster-modules/jhipster-microservice/gateway-app/README.md
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/README.md
rename to jhipster-modules/jhipster-microservice/gateway-app/README.md
diff --git a/jhipster/jhipster-microservice/gateway-app/bower.json b/jhipster-modules/jhipster-microservice/gateway-app/bower.json
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/bower.json
rename to jhipster-modules/jhipster-microservice/gateway-app/bower.json
diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/build.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/build.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/gulp/build.js
rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/build.js
diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/config.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/config.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/gulp/config.js
rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/config.js
diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/copy.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/copy.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/gulp/copy.js
rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/copy.js
diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/handle-errors.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/handle-errors.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/gulp/handle-errors.js
rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/handle-errors.js
diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/inject.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/inject.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/gulp/inject.js
rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/inject.js
diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/serve.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/serve.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/gulp/serve.js
rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/serve.js
diff --git a/jhipster/jhipster-microservice/gateway-app/gulp/utils.js b/jhipster-modules/jhipster-microservice/gateway-app/gulp/utils.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/gulp/utils.js
rename to jhipster-modules/jhipster-microservice/gateway-app/gulp/utils.js
diff --git a/jhipster/jhipster-microservice/gateway-app/gulpfile.js b/jhipster-modules/jhipster-microservice/gateway-app/gulpfile.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/gulpfile.js
rename to jhipster-modules/jhipster-microservice/gateway-app/gulpfile.js
diff --git a/jhipster/jhipster-microservice/gateway-app/mvnw b/jhipster-modules/jhipster-microservice/gateway-app/mvnw
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/mvnw
rename to jhipster-modules/jhipster-microservice/gateway-app/mvnw
diff --git a/jhipster/jhipster-microservice/gateway-app/mvnw.cmd b/jhipster-modules/jhipster-microservice/gateway-app/mvnw.cmd
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/mvnw.cmd
rename to jhipster-modules/jhipster-microservice/gateway-app/mvnw.cmd
diff --git a/jhipster/jhipster-microservice/gateway-app/package.json b/jhipster-modules/jhipster-microservice/gateway-app/package.json
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/package.json
rename to jhipster-modules/jhipster-microservice/gateway-app/package.json
diff --git a/jhipster/jhipster-microservice/gateway-app/pom.xml b/jhipster-modules/jhipster-microservice/gateway-app/pom.xml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/pom.xml
rename to jhipster-modules/jhipster-microservice/gateway-app/pom.xml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/Dockerfile b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/Dockerfile
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/Dockerfile
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/Dockerfile
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/app.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/app.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/app.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/app.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra-cluster.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra-cluster.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra-cluster.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra-cluster.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra-migration.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra-migration.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra-migration.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra-migration.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/Cassandra-Migration.Dockerfile b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/Cassandra-Migration.Dockerfile
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/Cassandra-Migration.Dockerfile
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/Cassandra-Migration.Dockerfile
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/autoMigrate.sh b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/autoMigrate.sh
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/autoMigrate.sh
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/autoMigrate.sh
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/execute-cql.sh b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/execute-cql.sh
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/execute-cql.sh
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/cassandra/scripts/execute-cql.sh
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/README.md
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/README.md
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/README.md
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/docker-config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/docker-config/application.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/docker-config/application.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/localhost-config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/central-server-config/localhost-config/application.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/central-server-config/localhost-config/application.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/jhipster-registry.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/jhipster-registry.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/jhipster-registry.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/mysql.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/mysql.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/mysql.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/mysql.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/docker/sonar.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/sonar.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/docker/sonar.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/docker/sonar.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/ApplicationWebXml.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/ApplicationWebXml.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/ApplicationWebXml.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/ApplicationWebXml.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/GatewayApp.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/GatewayApp.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/GatewayApp.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/GatewayApp.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/aop/logging/LoggingAspect.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/aop/logging/LoggingAspect.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/aop/logging/LoggingAspect.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ApplicationProperties.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ApplicationProperties.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ApplicationProperties.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ApplicationProperties.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/AsyncConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/AsyncConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/AsyncConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/AsyncConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CacheConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CacheConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CacheConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CacheConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CloudDatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CloudDatabaseConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/CloudDatabaseConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/Constants.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/Constants.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/Constants.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/Constants.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DatabaseConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DatabaseConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DateTimeFormatConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DateTimeFormatConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DateTimeFormatConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DefaultProfileUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DefaultProfileUtil.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/DefaultProfileUtil.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/GatewayConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/GatewayConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/GatewayConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/GatewayConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LocaleConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LocaleConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LocaleConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LocaleConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingAspectConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingAspectConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingAspectConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/LoggingConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/MetricsConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/MetricsConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/MetricsConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/MetricsConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/SecurityConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/SecurityConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/SecurityConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/SecurityConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ThymeleafConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ThymeleafConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ThymeleafConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/ThymeleafConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/WebConfigurer.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/WebConfigurer.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/WebConfigurer.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/WebConfigurer.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/AuditEventConverter.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/AuditEventConverter.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/AuditEventConverter.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/audit/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CassandraConfiguration.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CassandraConfiguration.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CassandraConfiguration.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CassandraConfiguration.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CustomZonedDateTimeCodec.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CustomZonedDateTimeCodec.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CustomZonedDateTimeCodec.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/CustomZonedDateTimeCodec.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/cassandra/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/config/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/AbstractAuditingEntity.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/AbstractAuditingEntity.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/AbstractAuditingEntity.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/Authority.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/Authority.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/Authority.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/Authority.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/PersistentAuditEvent.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/PersistentAuditEvent.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/PersistentAuditEvent.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/User.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/User.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/User.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/User.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/domain/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/TokenRelayFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/TokenRelayFilter.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/TokenRelayFilter.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/TokenRelayFilter.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/accesscontrol/AccessControlFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/accesscontrol/AccessControlFilter.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/accesscontrol/AccessControlFilter.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/accesscontrol/AccessControlFilter.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingFilter.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingFilter.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingFilter.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingRepository.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingRepository.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/ratelimiting/RateLimitingRepository.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/AuthorityRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/AuthorityRepository.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/AuthorityRepository.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/AuthorityRepository.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/CustomAuditEventRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/CustomAuditEventRepository.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/CustomAuditEventRepository.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/CustomAuditEventRepository.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/PersistenceAuditEventRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/PersistenceAuditEventRepository.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/PersistenceAuditEventRepository.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/PersistenceAuditEventRepository.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/UserRepository.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/UserRepository.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/UserRepository.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/UserRepository.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/repository/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/AuthoritiesConstants.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/AuthoritiesConstants.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/AuthoritiesConstants.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/DomainUserDetailsService.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/DomainUserDetailsService.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/DomainUserDetailsService.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/DomainUserDetailsService.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SecurityUtils.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SecurityUtils.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SecurityUtils.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SecurityUtils.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SpringSecurityAuditorAware.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SpringSecurityAuditorAware.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/SpringSecurityAuditorAware.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/UserNotActivatedException.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/UserNotActivatedException.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/UserNotActivatedException.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/UserNotActivatedException.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTConfigurer.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTConfigurer.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTConfigurer.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTConfigurer.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTFilter.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTFilter.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTFilter.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/JWTFilter.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/TokenProvider.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/TokenProvider.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/TokenProvider.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/jwt/TokenProvider.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/security/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/AuditEventService.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/AuditEventService.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/AuditEventService.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/AuditEventService.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/MailService.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/MailService.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/MailService.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/MailService.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/UserService.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/UserService.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/UserService.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/UserService.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/UserDTO.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/UserDTO.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/UserDTO.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/UserDTO.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/dto/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/UserMapper.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/UserMapper.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/UserMapper.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/UserMapper.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/mapper/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/util/RandomUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/util/RandomUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/util/RandomUtil.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/service/util/RandomUtil.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AccountResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AccountResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AccountResource.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AccountResource.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AuditResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AuditResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AuditResource.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/AuditResource.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/GatewayResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/GatewayResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/GatewayResource.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/GatewayResource.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/JWTToken.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/JWTToken.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/JWTToken.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/JWTToken.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/LogsResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/LogsResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/LogsResource.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/LogsResource.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/ProfileInfoResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/ProfileInfoResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/ProfileInfoResource.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/ProfileInfoResource.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserJWTController.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserJWTController.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserJWTController.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserJWTController.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserResource.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserResource.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserResource.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/UserResource.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/CustomParameterizedException.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/CustomParameterizedException.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/CustomParameterizedException.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorConstants.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorConstants.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorConstants.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorVM.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ErrorVM.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ExceptionTranslator.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ExceptionTranslator.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ExceptionTranslator.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/FieldErrorVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/FieldErrorVM.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/FieldErrorVM.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ParameterizedErrorVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ParameterizedErrorVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ParameterizedErrorVM.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/errors/ParameterizedErrorVM.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/HeaderUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/HeaderUtil.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/HeaderUtil.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/PaginationUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/PaginationUtil.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/util/PaginationUtil.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/KeyAndPasswordVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/KeyAndPasswordVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/KeyAndPasswordVM.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/KeyAndPasswordVM.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoggerVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoggerVM.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoggerVM.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoginVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoginVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoginVM.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/LoginVM.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/ManagedUserVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/ManagedUserVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/ManagedUserVM.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/ManagedUserVM.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/RouteVM.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/RouteVM.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/RouteVM.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/RouteVM.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/package-info.java b/jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/package-info.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/package-info.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/java/com/gateway/web/rest/vm/package-info.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/.h2.server.properties
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/.h2.server.properties
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/.h2.server.properties
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/banner.txt b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/banner.txt
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/banner.txt
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/banner.txt
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application-dev.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application-dev.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application-dev.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application-prod.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application-prod.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application-prod.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/application.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/application.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap-prod.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap-prod.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap-prod.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/changelog/README.md b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/changelog/README.md
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/changelog/README.md
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/changelog/README.md
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace-prod.cql b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace-prod.cql
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace-prod.cql
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace-prod.cql
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace.cql b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace.cql
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace.cql
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/create-keyspace.cql
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/drop-keyspace.cql b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/drop-keyspace.cql
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/cql/drop-keyspace.cql
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/cql/drop-keyspace.cql
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/authorities.csv b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/authorities.csv
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/authorities.csv
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/authorities.csv
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/master.xml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/master.xml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/master.xml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users.csv b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users.csv
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users.csv
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users.csv
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users_authorities.csv b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users_authorities.csv
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users_authorities.csv
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/config/liquibase/users_authorities.csv
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/i18n/messages.properties
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/i18n/messages.properties
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/i18n/messages.properties
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/logback-spring.xml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/logback-spring.xml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/logback-spring.xml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/activationEmail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/activationEmail.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/activationEmail.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/activationEmail.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/creationEmail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/creationEmail.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/creationEmail.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/creationEmail.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/passwordResetEmail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/passwordResetEmail.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/mails/passwordResetEmail.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/mails/passwordResetEmail.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/resources/templates/error.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/templates/error.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/resources/templates/error.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/resources/templates/error.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/404.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/404.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/404.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/404.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/account.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/account.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/account.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/account.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/activate/activate.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password-strength-bar.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password-strength-bar.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password-strength-bar.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password-strength-bar.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/password/password.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/register/register.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/finish/reset.finish.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/reset/request/reset.request.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/account/settings/settings.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/admin.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/admin.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/admin.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/admin.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/audits/audits.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/configuration/configuration.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/docs/docs.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway-routes.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway-routes.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway-routes.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway-routes.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/gateway/gateway.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.modal.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/health/health.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/logs/logs.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.modal.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/metrics/metrics.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-delete-dialog.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-detail.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management-dialog.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/admin/user-management/user-management.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.constants.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.constants.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.constants.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.constants.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.module.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.module.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.module.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.module.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/app.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/app.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/alert.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/alert.config.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/alert.config.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/alert.config.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/compile.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/compile.config.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/compile.config.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/compile.config.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/http.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/http.config.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/http.config.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/http.config.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/localstorage.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/localstorage.config.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/localstorage.config.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/localstorage.config.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pager.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pager.config.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pager.config.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pager.config.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pagination.config.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pagination.config.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pagination.config.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/config/uib-pagination.config.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/handlers/state.handler.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/handlers/state.handler.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/handlers/state.handler.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/handlers/state.handler.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth.interceptor.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth.interceptor.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth.interceptor.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/auth.interceptor.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/notification.interceptor.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/notification.interceptor.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/notification.interceptor.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/blocks/interceptor/notification.interceptor.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert-error.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert-error.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert-error.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert-error.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/alert/alert.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/maxbytes.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/maxbytes.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/maxbytes.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/maxbytes.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/minbytes.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/minbytes.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/minbytes.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/minbytes.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/pagination.constants.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/pagination.constants.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/pagination.constants.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/pagination.constants.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/show-validation.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/show-validation.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/show-validation.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/form/show-validation.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/login/login.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/base64.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/base64.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/base64.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/base64.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/capitalize.filter.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/capitalize.filter.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/capitalize.filter.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/capitalize.filter.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/data-util.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/data-util.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/data-util.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/data-util.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/date-util.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/date-util.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/date-util.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/date-util.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/jhi-item-count.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/jhi-item-count.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/jhi-item-count.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/jhi-item-count.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/pagination-util.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/pagination-util.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/pagination-util.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/pagination-util.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/parse-links.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/parse-links.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/parse-links.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/parse-links.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort-by.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort-by.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort-by.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort-by.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/sort.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-characters.filter.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-characters.filter.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-characters.filter.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-characters.filter.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-words.filter.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-words.filter.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-words.filter.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/components/util/truncate-words.filter.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-delete-dialog.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-detail.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car-dialog.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/car.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/cars.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/cars.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/cars.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/car/cars.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-delete-dialog.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-detail.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer-dialog.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealer.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealers.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealers.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealers.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/dealer/dealers.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/entity.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/entity.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/entities/entity.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/entities/entity.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/home/home.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/accessdenied.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/accessdenied.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/accessdenied.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/accessdenied.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.state.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.state.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.state.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/error/error.state.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.controller.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.controller.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.controller.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.controller.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/layouts/navbar/navbar.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/account.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/account.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/account.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/account.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/activate.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/activate.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/activate.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/activate.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.jwt.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.jwt.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.jwt.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.jwt.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/auth.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-any-authority.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-any-authority.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-any-authority.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-any-authority.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-authority.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-authority.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-authority.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/has-authority.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-finish.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-finish.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-finish.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-finish.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-init.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-init.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-init.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password-reset-init.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/password.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/principal.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/principal.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/principal.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/principal.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/register.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/register.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/register.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/auth/register.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/page-ribbon.directive.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/page-ribbon.directive.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/page-ribbon.directive.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/page-ribbon.directive.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/profile.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/profile.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/profile.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/profiles/profile.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/user/user.service.js b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/user/user.service.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/app/services/user/user.service.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/app/services/user/user.service.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/css/documentation.css b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/css/documentation.css
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/css/documentation.css
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/css/documentation.css
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/css/main.css b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/css/main.css
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/css/main.css
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/css/main.css
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster.png b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster.png
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster.png
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster.png
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster2x.png b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster2x.png
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster2x.png
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/hipster2x.png
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/logo-jhipster.png b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/logo-jhipster.png
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/content/images/logo-jhipster.png
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/content/images/logo-jhipster.png
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/favicon.ico b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/favicon.ico
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/favicon.ico
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/favicon.ico
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/index.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/index.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/index.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/index.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/robots.txt b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/robots.txt
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/robots.txt
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/robots.txt
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/images/throbber.gif b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/images/throbber.gif
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/images/throbber.gif
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/images/throbber.gif
diff --git a/jhipster/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/index.html b/jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/index.html
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/index.html
rename to jhipster-modules/jhipster-microservice/gateway-app/src/main/webapp/swagger-ui/index.html
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/SecurityUtilsUnitTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/SecurityUtilsUnitTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/SecurityUtilsUnitTest.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/SecurityUtilsUnitTest.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/ProfileInfoResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/ProfileInfoResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/ProfileInfoResourceIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/ProfileInfoResourceIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/TestUtil.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/TestUtil.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/TestUtil.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/TestUtil.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntegrationTest.java b/jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntegrationTest.java
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntegrationTest.java
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/karma.conf.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/karma.conf.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/karma.conf.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/karma.conf.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/activate/activate.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/activate/activate.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/activate/activate.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/activate/activate.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password-strength-bar.directive.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password-strength-bar.directive.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password-strength-bar.directive.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password-strength-bar.directive.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/password/password.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/register/register.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/register/register.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/register/register.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/register/register.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/finish/reset.finish.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/finish/reset.finish.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/finish/reset.finish.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/finish/reset.finish.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/request/reset.request.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/request/reset.request.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/request/reset.request.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/reset/request/reset.request.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/settings/settings.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/settings/settings.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/settings/settings.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/account/settings/settings.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/admin/health/health.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/admin/health/health.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/admin/health/health.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/admin/health/health.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/components/login/login.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/components/login/login.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/components/login/login.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/components/login/login.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/car/car-detail.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/car/car-detail.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/car/car-detail.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/car/car-detail.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/dealer/dealer-detail.controller.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/dealer/dealer-detail.controller.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/dealer/dealer-detail.controller.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/entities/dealer/dealer-detail.controller.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/services/auth/auth.services.spec.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/services/auth/auth.services.spec.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/app/services/auth/auth.services.spec.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/app/services/auth/auth.services.spec.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/httpBackend.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/httpBackend.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/httpBackend.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/httpBackend.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/module.js b/jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/module.js
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/module.js
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/javascript/spec/helpers/module.js
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/resources/config/application.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/resources/config/application.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/config/application.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/resources/logback-test.xml b/jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/logback-test.xml
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/src/test/resources/logback-test.xml
rename to jhipster-modules/jhipster-microservice/gateway-app/src/test/resources/logback-test.xml
diff --git a/jhipster/jhipster-microservice/gateway-app/yarn.lock b/jhipster-modules/jhipster-microservice/gateway-app/yarn.lock
similarity index 100%
rename from jhipster/jhipster-microservice/gateway-app/yarn.lock
rename to jhipster-modules/jhipster-microservice/gateway-app/yarn.lock
diff --git a/jhipster/jhipster-microservice/pom.xml b/jhipster-modules/jhipster-microservice/pom.xml
similarity index 93%
rename from jhipster/jhipster-microservice/pom.xml
rename to jhipster-modules/jhipster-microservice/pom.xml
index 3d2d682d8eb1..ae58ad220399 100644
--- a/jhipster/jhipster-microservice/pom.xml
+++ b/jhipster-modules/jhipster-microservice/pom.xml
@@ -7,7 +7,7 @@
     <packaging>pom</packaging>
 
 	<parent>
-        <artifactId>jhipster</artifactId>
+        <artifactId>jhipster-modules</artifactId>
         <groupId>com.baeldung.jhipster</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
diff --git a/jhipster/jhipster-monolithic/.editorconfig b/jhipster-modules/jhipster-monolithic/.editorconfig
similarity index 100%
rename from jhipster/jhipster-monolithic/.editorconfig
rename to jhipster-modules/jhipster-monolithic/.editorconfig
diff --git a/jhipster/jhipster-monolithic/.gitattributes b/jhipster-modules/jhipster-monolithic/.gitattributes
similarity index 100%
rename from jhipster/jhipster-monolithic/.gitattributes
rename to jhipster-modules/jhipster-monolithic/.gitattributes
diff --git a/jhipster/jhipster-monolithic/.gitignore b/jhipster-modules/jhipster-monolithic/.gitignore
similarity index 100%
rename from jhipster/jhipster-monolithic/.gitignore
rename to jhipster-modules/jhipster-monolithic/.gitignore
diff --git a/jhipster/jhipster-monolithic/.gitlab-ci.yml b/jhipster-modules/jhipster-monolithic/.gitlab-ci.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/.gitlab-ci.yml
rename to jhipster-modules/jhipster-monolithic/.gitlab-ci.yml
diff --git a/jhipster/jhipster-monolithic/.jhipster/Comment.json b/jhipster-modules/jhipster-monolithic/.jhipster/Comment.json
similarity index 100%
rename from jhipster/jhipster-monolithic/.jhipster/Comment.json
rename to jhipster-modules/jhipster-monolithic/.jhipster/Comment.json
diff --git a/jhipster/jhipster-monolithic/.jhipster/Post.json b/jhipster-modules/jhipster-monolithic/.jhipster/Post.json
similarity index 100%
rename from jhipster/jhipster-monolithic/.jhipster/Post.json
rename to jhipster-modules/jhipster-monolithic/.jhipster/Post.json
diff --git a/jhipster/jhipster-monolithic/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-monolithic/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from jhipster/jhipster-monolithic/.mvn/wrapper/maven-wrapper.jar
rename to jhipster-modules/jhipster-monolithic/.mvn/wrapper/maven-wrapper.jar
diff --git a/jhipster/jhipster-monolithic/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-monolithic/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from jhipster/jhipster-monolithic/.mvn/wrapper/maven-wrapper.properties
rename to jhipster-modules/jhipster-monolithic/.mvn/wrapper/maven-wrapper.properties
diff --git a/jhipster/jhipster-monolithic/.travis.yml b/jhipster-modules/jhipster-monolithic/.travis.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/.travis.yml
rename to jhipster-modules/jhipster-monolithic/.travis.yml
diff --git a/jhipster/jhipster-monolithic/.yo-rc.json b/jhipster-modules/jhipster-monolithic/.yo-rc.json
similarity index 100%
rename from jhipster/jhipster-monolithic/.yo-rc.json
rename to jhipster-modules/jhipster-monolithic/.yo-rc.json
diff --git a/jhipster/jhipster-monolithic/Jenkinsfile b/jhipster-modules/jhipster-monolithic/Jenkinsfile
similarity index 100%
rename from jhipster/jhipster-monolithic/Jenkinsfile
rename to jhipster-modules/jhipster-monolithic/Jenkinsfile
diff --git a/jhipster/jhipster-monolithic/README.md b/jhipster-modules/jhipster-monolithic/README.md
similarity index 100%
rename from jhipster/jhipster-monolithic/README.md
rename to jhipster-modules/jhipster-monolithic/README.md
diff --git a/jhipster/jhipster-monolithic/angular-cli.json b/jhipster-modules/jhipster-monolithic/angular-cli.json
similarity index 100%
rename from jhipster/jhipster-monolithic/angular-cli.json
rename to jhipster-modules/jhipster-monolithic/angular-cli.json
diff --git a/jhipster/jhipster-monolithic/circle.yml b/jhipster-modules/jhipster-monolithic/circle.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/circle.yml
rename to jhipster-modules/jhipster-monolithic/circle.yml
diff --git a/jhipster/jhipster-monolithic/mvnw b/jhipster-modules/jhipster-monolithic/mvnw
similarity index 100%
rename from jhipster/jhipster-monolithic/mvnw
rename to jhipster-modules/jhipster-monolithic/mvnw
diff --git a/jhipster/jhipster-monolithic/mvnw.cmd b/jhipster-modules/jhipster-monolithic/mvnw.cmd
similarity index 100%
rename from jhipster/jhipster-monolithic/mvnw.cmd
rename to jhipster-modules/jhipster-monolithic/mvnw.cmd
diff --git a/jhipster/jhipster-monolithic/package.json b/jhipster-modules/jhipster-monolithic/package.json
similarity index 100%
rename from jhipster/jhipster-monolithic/package.json
rename to jhipster-modules/jhipster-monolithic/package.json
diff --git a/jhipster/jhipster-monolithic/pom.xml b/jhipster-modules/jhipster-monolithic/pom.xml
similarity index 99%
rename from jhipster/jhipster-monolithic/pom.xml
rename to jhipster-modules/jhipster-monolithic/pom.xml
index 28cfc1685948..ac483fdae6a5 100644
--- a/jhipster/jhipster-monolithic/pom.xml
+++ b/jhipster-modules/jhipster-monolithic/pom.xml
@@ -7,7 +7,7 @@
     <description>JHipster Monolithic Application</description>
 
     <parent>
-        <artifactId>jhipster</artifactId>
+        <artifactId>jhipster-modules</artifactId>
         <groupId>com.baeldung.jhipster</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
diff --git a/jhipster/jhipster-monolithic/postcss.config.js b/jhipster-modules/jhipster-monolithic/postcss.config.js
similarity index 100%
rename from jhipster/jhipster-monolithic/postcss.config.js
rename to jhipster-modules/jhipster-monolithic/postcss.config.js
diff --git a/jhipster/jhipster-monolithic/src/main/docker/Dockerfile b/jhipster-modules/jhipster-monolithic/src/main/docker/Dockerfile
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/docker/Dockerfile
rename to jhipster-modules/jhipster-monolithic/src/main/docker/Dockerfile
diff --git a/jhipster/jhipster-monolithic/src/main/docker/app.yml b/jhipster-modules/jhipster-monolithic/src/main/docker/app.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/docker/app.yml
rename to jhipster-modules/jhipster-monolithic/src/main/docker/app.yml
diff --git a/jhipster/jhipster-monolithic/src/main/docker/mysql.yml b/jhipster-modules/jhipster-monolithic/src/main/docker/mysql.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/docker/mysql.yml
rename to jhipster-modules/jhipster-monolithic/src/main/docker/mysql.yml
diff --git a/jhipster/jhipster-monolithic/src/main/docker/sonar.yml b/jhipster-modules/jhipster-monolithic/src/main/docker/sonar.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/docker/sonar.yml
rename to jhipster-modules/jhipster-monolithic/src/main/docker/sonar.yml
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/ApplicationWebXml.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/ApplicationWebXml.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/ApplicationWebXml.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/ApplicationWebXml.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/BaeldungApp.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/BaeldungApp.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/BaeldungApp.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/BaeldungApp.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/aop/logging/LoggingAspect.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/aop/logging/LoggingAspect.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/aop/logging/LoggingAspect.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/ApplicationProperties.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/ApplicationProperties.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/ApplicationProperties.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/ApplicationProperties.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/AsyncConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/AsyncConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/AsyncConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/AsyncConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/CacheConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/CacheConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/CacheConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/CacheConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/CloudDatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/CloudDatabaseConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/CloudDatabaseConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/Constants.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/Constants.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/Constants.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/Constants.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DatabaseConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DatabaseConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DateTimeFormatConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DateTimeFormatConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DateTimeFormatConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DefaultProfileUtil.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/DefaultProfileUtil.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/DefaultProfileUtil.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LocaleConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LocaleConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LocaleConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LocaleConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingAspectConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingAspectConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingAspectConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/LoggingConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/MetricsConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/MetricsConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/MetricsConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/MetricsConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/SecurityConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/SecurityConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/SecurityConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/SecurityConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/ThymeleafConfiguration.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/ThymeleafConfiguration.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/ThymeleafConfiguration.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/ThymeleafConfiguration.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/WebConfigurer.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/WebConfigurer.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/WebConfigurer.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/WebConfigurer.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/audit/AuditEventConverter.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/audit/AuditEventConverter.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/audit/AuditEventConverter.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/audit/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/audit/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/audit/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/audit/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/config/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/config/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/AbstractAuditingEntity.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/AbstractAuditingEntity.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/AbstractAuditingEntity.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Authority.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Authority.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Authority.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Authority.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Comment.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Comment.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Comment.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Comment.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/PersistentAuditEvent.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/PersistentAuditEvent.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/PersistentAuditEvent.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Post.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Post.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/Post.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/Post.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/User.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/User.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/User.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/User.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/domain/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/domain/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/AuthorityRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/AuthorityRepository.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/AuthorityRepository.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/AuthorityRepository.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/CommentRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/CommentRepository.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/CommentRepository.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/CommentRepository.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/CustomAuditEventRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/CustomAuditEventRepository.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/CustomAuditEventRepository.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/CustomAuditEventRepository.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/PersistenceAuditEventRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/PersistenceAuditEventRepository.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/PersistenceAuditEventRepository.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/PersistenceAuditEventRepository.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/PostRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/PostRepository.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/PostRepository.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/PostRepository.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/UserRepository.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/UserRepository.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/UserRepository.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/UserRepository.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/repository/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/repository/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/AuthoritiesConstants.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/AuthoritiesConstants.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/AuthoritiesConstants.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/DomainUserDetailsService.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/DomainUserDetailsService.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/DomainUserDetailsService.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/DomainUserDetailsService.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/SecurityUtils.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/SecurityUtils.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/SecurityUtils.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/SecurityUtils.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/SpringSecurityAuditorAware.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/SpringSecurityAuditorAware.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/SpringSecurityAuditorAware.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/UserNotActivatedException.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/UserNotActivatedException.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/UserNotActivatedException.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/UserNotActivatedException.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTConfigurer.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTConfigurer.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTConfigurer.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTConfigurer.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTFilter.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTFilter.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTFilter.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/JWTFilter.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/TokenProvider.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/TokenProvider.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/TokenProvider.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/jwt/TokenProvider.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/security/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/security/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/AuditEventService.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/AuditEventService.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/AuditEventService.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/AuditEventService.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/MailService.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/MailService.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/MailService.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/MailService.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/UserService.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/UserService.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/UserService.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/UserService.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/dto/UserDTO.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/dto/UserDTO.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/dto/UserDTO.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/dto/UserDTO.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/dto/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/dto/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/dto/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/dto/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/UserMapper.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/UserMapper.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/UserMapper.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/UserMapper.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/mapper/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/util/RandomUtil.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/util/RandomUtil.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/service/util/RandomUtil.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/service/util/RandomUtil.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AccountResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AccountResource.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AccountResource.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AccountResource.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AuditResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AuditResource.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AuditResource.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/AuditResource.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/CommentResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/CommentResource.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/CommentResource.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/CommentResource.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/JWTToken.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/JWTToken.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/JWTToken.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/JWTToken.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/LogsResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/LogsResource.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/LogsResource.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/LogsResource.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/PostResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/PostResource.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/PostResource.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/PostResource.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/ProfileInfoResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/ProfileInfoResource.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/ProfileInfoResource.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/ProfileInfoResource.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserJWTController.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserJWTController.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserJWTController.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserJWTController.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserResource.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserResource.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserResource.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/UserResource.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/CustomParameterizedException.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/CustomParameterizedException.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/CustomParameterizedException.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorConstants.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorConstants.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorConstants.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorVM.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorVM.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ErrorVM.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ExceptionTranslator.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ExceptionTranslator.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ExceptionTranslator.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/FieldErrorVM.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/FieldErrorVM.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/FieldErrorVM.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ParameterizedErrorVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ParameterizedErrorVM.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ParameterizedErrorVM.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/errors/ParameterizedErrorVM.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/HeaderUtil.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/HeaderUtil.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/HeaderUtil.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/PaginationUtil.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/PaginationUtil.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/util/PaginationUtil.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/KeyAndPasswordVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/KeyAndPasswordVM.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/KeyAndPasswordVM.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/KeyAndPasswordVM.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoggerVM.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoggerVM.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoggerVM.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoginVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoginVM.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoginVM.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/LoginVM.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/ManagedUserVM.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/ManagedUserVM.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/ManagedUserVM.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/ManagedUserVM.java
diff --git a/jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/package-info.java b/jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/package-info.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/package-info.java
rename to jhipster-modules/jhipster-monolithic/src/main/java/com/baeldung/web/rest/vm/package-info.java
diff --git a/jhipster/jhipster-monolithic/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-monolithic/src/main/resources/.h2.server.properties
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/.h2.server.properties
rename to jhipster-modules/jhipster-monolithic/src/main/resources/.h2.server.properties
diff --git a/jhipster/jhipster-monolithic/src/main/resources/banner.txt b/jhipster-modules/jhipster-monolithic/src/main/resources/banner.txt
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/banner.txt
rename to jhipster-modules/jhipster-monolithic/src/main/resources/banner.txt
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/application-dev.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/application-dev.yml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/application-dev.yml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/application-prod.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/application-prod.yml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/application-prod.yml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/application.yml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/application.yml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/application.yml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/authorities.csv b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/authorities.csv
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/authorities.csv
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/authorities.csv
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_Post.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_Post.xml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_Post.xml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_Post.xml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_constraints_Post.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_constraints_Post.xml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_constraints_Post.xml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316223211_added_entity_constraints_Post.xml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_Comment.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_Comment.xml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_Comment.xml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_Comment.xml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_constraints_Comment.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_constraints_Comment.xml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_constraints_Comment.xml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/changelog/20170316224021_added_entity_constraints_Comment.xml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/master.xml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/master.xml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/master.xml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/users.csv b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/users.csv
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/users.csv
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/users.csv
diff --git a/jhipster/jhipster-monolithic/src/main/resources/config/liquibase/users_authorities.csv b/jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/users_authorities.csv
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/config/liquibase/users_authorities.csv
rename to jhipster-modules/jhipster-monolithic/src/main/resources/config/liquibase/users_authorities.csv
diff --git a/jhipster/jhipster-monolithic/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-monolithic/src/main/resources/i18n/messages.properties
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/i18n/messages.properties
rename to jhipster-modules/jhipster-monolithic/src/main/resources/i18n/messages.properties
diff --git a/jhipster/jhipster-monolithic/src/main/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-monolithic/src/main/resources/i18n/messages_en.properties
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/i18n/messages_en.properties
rename to jhipster-modules/jhipster-monolithic/src/main/resources/i18n/messages_en.properties
diff --git a/jhipster/jhipster-monolithic/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-monolithic/src/main/resources/logback-spring.xml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/logback-spring.xml
rename to jhipster-modules/jhipster-monolithic/src/main/resources/logback-spring.xml
diff --git a/jhipster/jhipster-monolithic/src/main/resources/mails/activationEmail.html b/jhipster-modules/jhipster-monolithic/src/main/resources/mails/activationEmail.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/mails/activationEmail.html
rename to jhipster-modules/jhipster-monolithic/src/main/resources/mails/activationEmail.html
diff --git a/jhipster/jhipster-monolithic/src/main/resources/mails/creationEmail.html b/jhipster-modules/jhipster-monolithic/src/main/resources/mails/creationEmail.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/mails/creationEmail.html
rename to jhipster-modules/jhipster-monolithic/src/main/resources/mails/creationEmail.html
diff --git a/jhipster/jhipster-monolithic/src/main/resources/mails/passwordResetEmail.html b/jhipster-modules/jhipster-monolithic/src/main/resources/mails/passwordResetEmail.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/mails/passwordResetEmail.html
rename to jhipster-modules/jhipster-monolithic/src/main/resources/mails/passwordResetEmail.html
diff --git a/jhipster/jhipster-monolithic/src/main/resources/templates/error.html b/jhipster-modules/jhipster-monolithic/src/main/resources/templates/error.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/resources/templates/error.html
rename to jhipster-modules/jhipster-monolithic/src/main/resources/templates/error.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/404.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/404.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/404.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/404.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/account.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/account.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/account.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/account.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/account.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/account.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/account.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/account.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/activate/activate.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/activate/activate.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/index.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/index.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/index.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.scss
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.scss
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password-strength-bar.scss
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/password/password.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/password/password.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/register/register.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/register/register.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/account/settings/settings.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/account/settings/settings.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/admin.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/admin.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/admin.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/admin.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/admin.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/admin.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/admin.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/admin.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audit-data.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audit-data.model.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audit-data.model.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audit-data.model.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audit.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audit.model.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audit.model.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audit.model.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/audits/audits.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/configuration/configuration.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/docs/docs.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health-modal.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/health/health.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/health/health.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/index.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/index.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/index.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/log.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/log.model.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/log.model.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/log.model.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/logs/logs.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics-modal.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/metrics/metrics.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-detail.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-management.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-modal.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-modal.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-modal.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/admin/user-management/user-modal.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/app.constants.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.constants.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/app.constants.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.constants.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/app.main.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.main.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/app.main.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.main.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/app.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/app.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/app.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/app.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/app.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/config/prod.config.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/config/prod.config.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/config/prod.config.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/config/prod.config.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/config/uib-pagination.config.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/config/uib-pagination.config.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/config/uib-pagination.config.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/config/uib-pagination.config.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/http.provider.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/http.provider.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/http.provider.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/http.provider.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-delete-dialog.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-detail.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-dialog.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-popup.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-popup.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-popup.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment-popup.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.model.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.model.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.model.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/comment.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/index.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/comment/index.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/comment/index.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/entity.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/entity.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/entity.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/entity.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/index.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/index.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/index.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-delete-dialog.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-detail.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-dialog.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-popup.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-popup.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post-popup.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post-popup.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.model.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.model.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.model.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/entities/post/post.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/entities/post/post.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/home.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.scss
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/home.scss
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/home.scss
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/home/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/index.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/home/index.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/home/index.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.route.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.route.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/error/error.route.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/error/error.route.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/footer/footer.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/index.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/index.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/index.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/layout-routing.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/layout-routing.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/layout-routing.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/layout-routing.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/main/main.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/active-menu.directive.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/active-menu.directive.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/active-menu.directive.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/active-menu.directive.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.scss
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.scss
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/navbar/navbar.scss
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.scss
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.scss
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/page-ribbon.scss
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile-info.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile-info.model.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile-info.model.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile-info.model.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/layouts/profiles/profile.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/polyfills.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/polyfills.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/polyfills.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/polyfills.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/alert/alert-error.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/alert/alert-error.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/alert/alert-error.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/alert/alert-error.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/alert/alert.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/alert/alert.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/alert/alert.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/alert/alert.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/account.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/account.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/account.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/account.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/auth-jwt.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/auth-jwt.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/auth-jwt.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/auth-jwt.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/auth.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/auth.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/auth.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/auth.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/csrf.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/csrf.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/csrf.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/csrf.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/has-any-authority.directive.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/has-any-authority.directive.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/has-any-authority.directive.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/has-any-authority.directive.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/principal.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/principal.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/principal.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/principal.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/state-storage.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/state-storage.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/state-storage.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/state-storage.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/user-route-access-service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/user-route-access-service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/auth/user-route-access-service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/auth/user-route-access-service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/constants/pagination.constants.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/constants/pagination.constants.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/constants/pagination.constants.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/constants/pagination.constants.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/index.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/index.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/index.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/index.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.constants.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.constants.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.constants.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.constants.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.helper.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.helper.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.helper.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.helper.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.pipe.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.pipe.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/language/language.pipe.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/language/language.pipe.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login-modal.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login-modal.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login-modal.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login-modal.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.component.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/login/login.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/login/login.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared-common.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared-common.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared-common.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared-common.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared-libs.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared-libs.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared-libs.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared-libs.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared.module.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/shared.module.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/shared.module.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/account.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/account.model.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/account.model.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/account.model.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/user.model.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/user.model.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/user.model.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/user.model.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/user.service.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/user.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/shared/user/user.service.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/shared/user/user.service.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/app/vendor.ts b/jhipster-modules/jhipster-monolithic/src/main/webapp/app/vendor.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/app/vendor.ts
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/app/vendor.ts
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/images/hipster.png b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/hipster.png
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/content/images/hipster.png
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/hipster.png
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/images/hipster2x.png b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/hipster2x.png
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/content/images/hipster2x.png
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/hipster2x.png
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/images/logo-jhipster.png b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/logo-jhipster.png
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/content/images/logo-jhipster.png
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/images/logo-jhipster.png
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/scss/global.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/scss/global.scss
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/content/scss/global.scss
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/scss/global.scss
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/content/scss/vendor.scss b/jhipster-modules/jhipster-monolithic/src/main/webapp/content/scss/vendor.scss
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/content/scss/vendor.scss
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/content/scss/vendor.scss
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/favicon.ico b/jhipster-modules/jhipster-monolithic/src/main/webapp/favicon.ico
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/favicon.ico
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/favicon.ico
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/activate.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/activate.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/activate.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/activate.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/audits.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/audits.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/audits.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/audits.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/comment.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/comment.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/comment.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/comment.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/configuration.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/configuration.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/configuration.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/configuration.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/error.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/error.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/error.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/error.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/gateway.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/gateway.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/gateway.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/gateway.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/global.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/global.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/global.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/global.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/health.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/health.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/health.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/health.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/home.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/home.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/home.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/home.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/login.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/login.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/login.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/login.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/logs.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/logs.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/logs.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/logs.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/metrics.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/metrics.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/metrics.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/metrics.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/password.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/password.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/password.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/password.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/post.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/post.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/post.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/post.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/register.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/register.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/register.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/register.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/reset.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/reset.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/reset.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/reset.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/sessions.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/sessions.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/sessions.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/sessions.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/settings.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/settings.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/settings.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/settings.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/i18n/en/user-management.json b/jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/user-management.json
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/i18n/en/user-management.json
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/i18n/en/user-management.json
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/index.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/index.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/index.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/index.html
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/robots.txt b/jhipster-modules/jhipster-monolithic/src/main/webapp/robots.txt
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/robots.txt
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/robots.txt
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/swagger-ui/images/throbber.gif b/jhipster-modules/jhipster-monolithic/src/main/webapp/swagger-ui/images/throbber.gif
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/swagger-ui/images/throbber.gif
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/swagger-ui/images/throbber.gif
diff --git a/jhipster/jhipster-monolithic/src/main/webapp/swagger-ui/index.html b/jhipster-modules/jhipster-monolithic/src/main/webapp/swagger-ui/index.html
similarity index 100%
rename from jhipster/jhipster-monolithic/src/main/webapp/swagger-ui/index.html
rename to jhipster-modules/jhipster-monolithic/src/main/webapp/swagger-ui/index.html
diff --git a/jhipster/jhipster-monolithic/src/test/gatling/conf/gatling.conf b/jhipster-modules/jhipster-monolithic/src/test/gatling/conf/gatling.conf
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/gatling/conf/gatling.conf
rename to jhipster-modules/jhipster-monolithic/src/test/gatling/conf/gatling.conf
diff --git a/jhipster/jhipster-monolithic/src/test/gatling/conf/logback.xml b/jhipster-modules/jhipster-monolithic/src/test/gatling/conf/logback.xml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/gatling/conf/logback.xml
rename to jhipster-modules/jhipster-monolithic/src/test/gatling/conf/logback.xml
diff --git a/jhipster/jhipster-monolithic/src/test/gatling/simulations/CommentGatlingTest.scala b/jhipster-modules/jhipster-monolithic/src/test/gatling/simulations/CommentGatlingTest.scala
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/gatling/simulations/CommentGatlingTest.scala
rename to jhipster-modules/jhipster-monolithic/src/test/gatling/simulations/CommentGatlingTest.scala
diff --git a/jhipster/jhipster-monolithic/src/test/gatling/simulations/PostGatlingTest.scala b/jhipster-modules/jhipster-monolithic/src/test/gatling/simulations/PostGatlingTest.scala
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/gatling/simulations/PostGatlingTest.scala
rename to jhipster-modules/jhipster-monolithic/src/test/gatling/simulations/PostGatlingTest.scala
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/SecurityUtilsUnitTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/security/SecurityUtilsUnitTest.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/SecurityUtilsUnitTest.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/security/SecurityUtilsUnitTest.java
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/ProfileInfoResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/ProfileInfoResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/ProfileInfoResourceIntegrationTest.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/ProfileInfoResourceIntegrationTest.java
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/TestUtil.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/TestUtil.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/TestUtil.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/TestUtil.java
diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntegrationTest.java b/jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntegrationTest.java
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntegrationTest.java
rename to jhipster-modules/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntegrationTest.java
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/e2e/account/account.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/account/account.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/e2e/account/account.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/account/account.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/e2e/admin/administration.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/admin/administration.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/e2e/admin/administration.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/admin/administration.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/e2e/entities/comment.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/entities/comment.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/e2e/entities/comment.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/entities/comment.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/e2e/entities/post.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/entities/post.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/e2e/entities/post.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/e2e/entities/post.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/karma.conf.js b/jhipster-modules/jhipster-monolithic/src/test/javascript/karma.conf.js
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/karma.conf.js
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/karma.conf.js
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/protractor.conf.js b/jhipster-modules/jhipster-monolithic/src/test/javascript/protractor.conf.js
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/protractor.conf.js
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/protractor.conf.js
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/activate/activate.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/activate/activate.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/activate/activate.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/activate/activate.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password/password.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password/password.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/password/password.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/password/password.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/register/register.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/register/register.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/register/register.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/register/register.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/settings/settings.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/settings/settings.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/account/settings/settings.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/account/settings/settings.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/admin/health/health.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/admin/health/health.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/admin/health/health.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/admin/health/health.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/entities/comment/comment-detail.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/entities/comment/comment-detail.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/entities/comment/comment-detail.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/entities/comment/comment-detail.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/app/entities/post/post-detail.component.spec.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/entities/post/post-detail.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/app/entities/post/post-detail.component.spec.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/app/entities/post/post-detail.component.spec.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/entry.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/entry.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/entry.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/entry.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-account.service.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-account.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-account.service.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-account.service.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-language.service.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-language.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-language.service.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-language.service.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-principal.service.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-principal.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-principal.service.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-principal.service.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-route.service.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-route.service.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/mock-route.service.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/mock-route.service.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/spyobject.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/spyobject.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/helpers/spyobject.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/helpers/spyobject.ts
diff --git a/jhipster/jhipster-monolithic/src/test/javascript/spec/test.module.ts b/jhipster-modules/jhipster-monolithic/src/test/javascript/spec/test.module.ts
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/javascript/spec/test.module.ts
rename to jhipster-modules/jhipster-monolithic/src/test/javascript/spec/test.module.ts
diff --git a/jhipster/jhipster-monolithic/src/test/resources/config/application.yml b/jhipster-modules/jhipster-monolithic/src/test/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/resources/config/application.yml
rename to jhipster-modules/jhipster-monolithic/src/test/resources/config/application.yml
diff --git a/jhipster/jhipster-monolithic/src/test/resources/logback-test.xml b/jhipster-modules/jhipster-monolithic/src/test/resources/logback-test.xml
similarity index 100%
rename from jhipster/jhipster-monolithic/src/test/resources/logback-test.xml
rename to jhipster-modules/jhipster-monolithic/src/test/resources/logback-test.xml
diff --git a/jhipster/jhipster-monolithic/tsconfig.json b/jhipster-modules/jhipster-monolithic/tsconfig.json
similarity index 100%
rename from jhipster/jhipster-monolithic/tsconfig.json
rename to jhipster-modules/jhipster-monolithic/tsconfig.json
diff --git a/jhipster/jhipster-monolithic/tslint.json b/jhipster-modules/jhipster-monolithic/tslint.json
similarity index 100%
rename from jhipster/jhipster-monolithic/tslint.json
rename to jhipster-modules/jhipster-monolithic/tslint.json
diff --git a/jhipster/jhipster-monolithic/webpack/webpack.common.js b/jhipster-modules/jhipster-monolithic/webpack/webpack.common.js
similarity index 100%
rename from jhipster/jhipster-monolithic/webpack/webpack.common.js
rename to jhipster-modules/jhipster-monolithic/webpack/webpack.common.js
diff --git a/jhipster/jhipster-monolithic/webpack/webpack.dev.js b/jhipster-modules/jhipster-monolithic/webpack/webpack.dev.js
similarity index 100%
rename from jhipster/jhipster-monolithic/webpack/webpack.dev.js
rename to jhipster-modules/jhipster-monolithic/webpack/webpack.dev.js
diff --git a/jhipster/jhipster-monolithic/webpack/webpack.prod.js b/jhipster-modules/jhipster-monolithic/webpack/webpack.prod.js
similarity index 100%
rename from jhipster/jhipster-monolithic/webpack/webpack.prod.js
rename to jhipster-modules/jhipster-monolithic/webpack/webpack.prod.js
diff --git a/jhipster/jhipster-monolithic/webpack/webpack.vendor.js b/jhipster-modules/jhipster-monolithic/webpack/webpack.vendor.js
similarity index 100%
rename from jhipster/jhipster-monolithic/webpack/webpack.vendor.js
rename to jhipster-modules/jhipster-monolithic/webpack/webpack.vendor.js
diff --git a/jhipster/jhipster-uaa/README.md b/jhipster-modules/jhipster-uaa/README.md
similarity index 100%
rename from jhipster/jhipster-uaa/README.md
rename to jhipster-modules/jhipster-uaa/README.md
diff --git a/jhipster/jhipster-uaa/gateway/.editorconfig b/jhipster-modules/jhipster-uaa/gateway/.editorconfig
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.editorconfig
rename to jhipster-modules/jhipster-uaa/gateway/.editorconfig
diff --git a/jhipster/jhipster-uaa/gateway/.gitattributes b/jhipster-modules/jhipster-uaa/gateway/.gitattributes
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.gitattributes
rename to jhipster-modules/jhipster-uaa/gateway/.gitattributes
diff --git a/jhipster/jhipster-uaa/gateway/.gitignore b/jhipster-modules/jhipster-uaa/gateway/.gitignore
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.gitignore
rename to jhipster-modules/jhipster-uaa/gateway/.gitignore
diff --git a/jhipster/jhipster-uaa/gateway/.huskyrc b/jhipster-modules/jhipster-uaa/gateway/.huskyrc
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.huskyrc
rename to jhipster-modules/jhipster-uaa/gateway/.huskyrc
diff --git a/jhipster/jhipster-uaa/gateway/.jhipster/Quote.json b/jhipster-modules/jhipster-uaa/gateway/.jhipster/Quote.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.jhipster/Quote.json
rename to jhipster-modules/jhipster-uaa/gateway/.jhipster/Quote.json
diff --git a/jhipster/jhipster-uaa/gateway/.mvn/wrapper/MavenWrapperDownloader.java b/jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.mvn/wrapper/MavenWrapperDownloader.java
rename to jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/jhipster/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.jar
rename to jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.jar
diff --git a/jhipster/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.properties
rename to jhipster-modules/jhipster-uaa/gateway/.mvn/wrapper/maven-wrapper.properties
diff --git a/jhipster/jhipster-uaa/gateway/.prettierignore b/jhipster-modules/jhipster-uaa/gateway/.prettierignore
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.prettierignore
rename to jhipster-modules/jhipster-uaa/gateway/.prettierignore
diff --git a/jhipster/jhipster-uaa/gateway/.prettierrc b/jhipster-modules/jhipster-uaa/gateway/.prettierrc
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.prettierrc
rename to jhipster-modules/jhipster-uaa/gateway/.prettierrc
diff --git a/jhipster/jhipster-uaa/gateway/.yo-rc.json b/jhipster-modules/jhipster-uaa/gateway/.yo-rc.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/.yo-rc.json
rename to jhipster-modules/jhipster-uaa/gateway/.yo-rc.json
diff --git a/jhipster/jhipster-uaa/gateway/README.md b/jhipster-modules/jhipster-uaa/gateway/README.md
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/README.md
rename to jhipster-modules/jhipster-uaa/gateway/README.md
diff --git a/jhipster/jhipster-uaa/gateway/angular.json b/jhipster-modules/jhipster-uaa/gateway/angular.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/angular.json
rename to jhipster-modules/jhipster-uaa/gateway/angular.json
diff --git a/jhipster/jhipster-uaa/gateway/mvnw b/jhipster-modules/jhipster-uaa/gateway/mvnw
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/mvnw
rename to jhipster-modules/jhipster-uaa/gateway/mvnw
diff --git a/jhipster/jhipster-uaa/gateway/mvnw.cmd b/jhipster-modules/jhipster-uaa/gateway/mvnw.cmd
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/mvnw.cmd
rename to jhipster-modules/jhipster-uaa/gateway/mvnw.cmd
diff --git a/jhipster/jhipster-uaa/gateway/package-lock.json b/jhipster-modules/jhipster-uaa/gateway/package-lock.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/package-lock.json
rename to jhipster-modules/jhipster-uaa/gateway/package-lock.json
diff --git a/jhipster/jhipster-uaa/gateway/package.json b/jhipster-modules/jhipster-uaa/gateway/package.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/package.json
rename to jhipster-modules/jhipster-uaa/gateway/package.json
diff --git a/jhipster/jhipster-uaa/gateway/pom.xml b/jhipster-modules/jhipster-uaa/gateway/pom.xml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/pom.xml
rename to jhipster-modules/jhipster-uaa/gateway/pom.xml
diff --git a/jhipster/jhipster-uaa/gateway/postcss.config.js b/jhipster-modules/jhipster-uaa/gateway/postcss.config.js
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/postcss.config.js
rename to jhipster-modules/jhipster-uaa/gateway/postcss.config.js
diff --git a/jhipster/jhipster-uaa/gateway/proxy.conf.json b/jhipster-modules/jhipster-uaa/gateway/proxy.conf.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/proxy.conf.json
rename to jhipster-modules/jhipster-uaa/gateway/proxy.conf.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/.dockerignore b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/.dockerignore
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/.dockerignore
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/.dockerignore
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/Dockerfile b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/Dockerfile
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/Dockerfile
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/Dockerfile
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/app.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/app.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/app.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/app.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/README.md
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/README.md
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/README.md
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/docker-config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/docker-config/application.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/docker-config/application.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/localhost-config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/central-server-config/localhost-config/application.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/central-server-config/localhost-config/application.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/entrypoint.sh b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/entrypoint.sh
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/entrypoint.sh
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/entrypoint.sh
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/hazelcast-management-center.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/hazelcast-management-center.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/hazelcast-management-center.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/hazelcast-management-center.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/jhipster-registry.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/jhipster-registry.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/jhipster-registry.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/mysql.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/mysql.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/mysql.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/mysql.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/docker/sonar.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/docker/sonar.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/docker/sonar.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/docker/sonar.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/ApplicationWebXml.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/ApplicationWebXml.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/ApplicationWebXml.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/ApplicationWebXml.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/GatewayApp.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/GatewayApp.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/GatewayApp.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/GatewayApp.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/aop/logging/LoggingAspect.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/aop/logging/LoggingAspect.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/aop/logging/LoggingAspect.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/ApplicationProperties.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/ApplicationProperties.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/ApplicationProperties.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/ApplicationProperties.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/AsyncConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/AsyncConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/AsyncConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/AsyncConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CacheConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CacheConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CacheConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CacheConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CloudDatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CloudDatabaseConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/CloudDatabaseConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/Constants.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/Constants.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/Constants.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/Constants.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DatabaseConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DatabaseConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DateTimeFormatConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DateTimeFormatConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DateTimeFormatConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DefaultProfileUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DefaultProfileUtil.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/DefaultProfileUtil.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/GatewayConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/GatewayConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/GatewayConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/GatewayConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/JacksonConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/JacksonConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/JacksonConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/JacksonConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LiquibaseConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LiquibaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LiquibaseConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LiquibaseConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LocaleConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LocaleConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LocaleConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LocaleConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingAspectConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingAspectConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingAspectConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/LoggingConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/MetricsConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/MetricsConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/MetricsConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/MetricsConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/SecurityConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/SecurityConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/SecurityConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/SecurityConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/WebConfigurer.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/WebConfigurer.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/WebConfigurer.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/WebConfigurer.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/apidoc/GatewaySwaggerResourcesProvider.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/AuditEventConverter.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/AuditEventConverter.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/AuditEventConverter.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/package-info.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/audit/package-info.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2AuthenticationConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2AuthenticationConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2AuthenticationConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2AuthenticationConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2JwtAccessTokenConverter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2JwtAccessTokenConverter.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2JwtAccessTokenConverter.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2JwtAccessTokenConverter.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2Properties.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2Properties.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2Properties.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/oauth2/OAuth2Properties.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/package-info.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/config/package-info.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/AbstractAuditingEntity.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/AbstractAuditingEntity.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/AbstractAuditingEntity.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/PersistentAuditEvent.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/PersistentAuditEvent.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/PersistentAuditEvent.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/package-info.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/domain/package-info.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/accesscontrol/AccessControlFilter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/accesscontrol/AccessControlFilter.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/accesscontrol/AccessControlFilter.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/accesscontrol/AccessControlFilter.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/ratelimiting/RateLimitingFilter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/ratelimiting/RateLimitingFilter.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/ratelimiting/RateLimitingFilter.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/ratelimiting/RateLimitingFilter.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilter.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/repository/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/repository/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/repository/package-info.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/repository/package-info.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/AuthoritiesConstants.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/AuthoritiesConstants.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/AuthoritiesConstants.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SecurityUtils.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SecurityUtils.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SecurityUtils.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SecurityUtils.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SpringSecurityAuditorAware.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SpringSecurityAuditorAware.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/SpringSecurityAuditorAware.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollection.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollection.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollection.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollection.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractor.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractor.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractor.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractor.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookiesHttpServletRequestWrapper.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookiesHttpServletRequestWrapper.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookiesHttpServletRequestWrapper.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/CookiesHttpServletRequestWrapper.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationService.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationService.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationService.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationService.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelper.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelper.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelper.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelper.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2Cookies.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2Cookies.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2Cookies.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2Cookies.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2SignatureVerifierClient.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2SignatureVerifierClient.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2SignatureVerifierClient.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2SignatureVerifierClient.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClient.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClient.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClient.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClient.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClientAdapter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClientAdapter.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClientAdapter.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2TokenEndpointClientAdapter.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaSignatureVerifierClient.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaSignatureVerifierClient.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaSignatureVerifierClient.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaSignatureVerifierClient.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/package-info.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/package-info.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/service/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/service/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/service/package-info.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/service/package-info.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilter.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilter.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilter.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilter.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilterConfigurer.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilterConfigurer.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilterConfigurer.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/filter/RefreshTokenFilterConfigurer.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/AuthResource.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/AuthResource.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/AuthResource.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/AuthResource.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/GatewayResource.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/GatewayResource.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/GatewayResource.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/GatewayResource.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/LogsResource.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/LogsResource.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/LogsResource.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/LogsResource.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/BadRequestAlertException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/BadRequestAlertException.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/BadRequestAlertException.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/BadRequestAlertException.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/CustomParameterizedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/CustomParameterizedException.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/CustomParameterizedException.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailAlreadyUsedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailAlreadyUsedException.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailAlreadyUsedException.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailNotFoundException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailNotFoundException.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailNotFoundException.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/EmailNotFoundException.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ErrorConstants.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ErrorConstants.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ErrorConstants.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslator.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslator.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslator.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/FieldErrorVM.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/FieldErrorVM.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/FieldErrorVM.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InternalServerErrorException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InternalServerErrorException.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InternalServerErrorException.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InternalServerErrorException.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InvalidPasswordException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InvalidPasswordException.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InvalidPasswordException.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/InvalidPasswordException.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/LoginAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/LoginAlreadyUsedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/LoginAlreadyUsedException.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/LoginAlreadyUsedException.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/package-info.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/errors/package-info.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/package-info.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/package-info.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/HeaderUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/HeaderUtil.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/HeaderUtil.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtil.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtil.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/LoggerVM.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/LoggerVM.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/LoggerVM.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/RouteVM.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/RouteVM.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/RouteVM.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/RouteVM.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/package-info.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/package-info.java
rename to jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/web/rest/vm/package-info.java
diff --git a/jhipster/jhipster-uaa/gateway/src/main/jib/entrypoint.sh b/jhipster-modules/jhipster-uaa/gateway/src/main/jib/entrypoint.sh
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/jib/entrypoint.sh
rename to jhipster-modules/jhipster-uaa/gateway/src/main/jib/entrypoint.sh
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/.h2.server.properties
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/.h2.server.properties
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/.h2.server.properties
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/banner.txt b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/banner.txt
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/banner.txt
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/banner.txt
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-dev.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/application-dev.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-dev.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-prod.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/application-prod.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-prod.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/application-tls.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-tls.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/application-tls.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application-tls.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/application.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/application.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/application.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/bootstrap-prod.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/bootstrap-prod.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/bootstrap-prod.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/liquibase/master.xml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/liquibase/master.xml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/liquibase/master.xml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/config/tls/keystore.p12 b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/tls/keystore.p12
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/config/tls/keystore.p12
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/config/tls/keystore.p12
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages.properties
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages.properties
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages.properties
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_en.properties
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_en.properties
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_en.properties
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_fr.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_fr.properties
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_fr.properties
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_fr.properties
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_pt_br.properties b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_pt_br.properties
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/i18n/messages_pt_br.properties
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/i18n/messages_pt_br.properties
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/logback-spring.xml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/logback-spring.xml
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/logback-spring.xml
diff --git a/jhipster/jhipster-uaa/gateway/src/main/resources/templates/error.html b/jhipster-modules/jhipster-uaa/gateway/src/main/resources/templates/error.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/resources/templates/error.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/resources/templates/error.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/404.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/404.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/404.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/404.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/account.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/account.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/account.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/account.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/account.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/account.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/account.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/account.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/activate/activate.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/index.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/index.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/index.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.scss
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.scss
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password-strength-bar.scss
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/password/password.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/register/register.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/account/settings/settings.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/admin.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit-data.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit-data.model.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit-data.model.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit-data.model.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit.model.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit.model.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audit.model.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/audits/audits.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/configuration/configuration.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/docs/docs.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-route.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-route.model.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-route.model.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-route.model.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-routes.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-routes.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-routes.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway-routes.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/gateway/gateway.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health-modal.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/health/health.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/index.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/index.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/index.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/log.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/log.model.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/log.model.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/log.model.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/logs/logs.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics-modal.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/metrics/metrics.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-detail.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management-update.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/admin/user-management/user-management.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/app-routing.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app-routing.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/app-routing.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app-routing.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.constants.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.constants.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.constants.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.main.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.main.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.main.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.main.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/app.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/app.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/prod.config.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/prod.config.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/prod.config.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/prod.config.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/uib-pagination.config.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/uib-pagination.config.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/uib-pagination.config.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/config/uib-pagination.config.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/account.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/account.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/account.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/account.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/auth-jwt.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/auth-jwt.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/auth-jwt.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/auth-jwt.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/csrf.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/csrf.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/csrf.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/csrf.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/principal.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/principal.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/principal.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/principal.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/state-storage.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/state-storage.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/state-storage.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/state-storage.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/user-route-access-service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/user-route-access-service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/auth/user-route-access-service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/auth/user-route-access-service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/core.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/core.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/core.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/core.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/index.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/index.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/index.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.constants.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.constants.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.constants.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.helper.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.helper.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.helper.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/language/language.helper.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/login/login-modal.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/login/login-modal.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/login/login-modal.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/login/login-modal.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/login/login.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/login/login.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/login/login.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/login/login.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/account.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/account.model.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/account.model.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/account.model.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.model.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.model.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.model.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/core/user/user.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/entity.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/entity.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/entity.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/entity.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/index.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/index.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/index.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-delete-dialog.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-detail.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote-update.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/entities/quotes/quote/quote.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.scss
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/home.scss
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/home.scss
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/index.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/home/index.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/home/index.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/error/error.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/footer/footer.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/index.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/index.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/index.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/main/main.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/active-menu.directive.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/active-menu.directive.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/active-menu.directive.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/active-menu.directive.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.route.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.route.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.route.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.route.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.scss
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.scss
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/navbar/navbar.scss
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.scss
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.scss
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/page-ribbon.scss
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile-info.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile-info.model.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile-info.model.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile-info.model.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/layouts/profiles/profile.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/polyfills.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/polyfills.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/polyfills.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/polyfills.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert-error.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert-error.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert-error.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert-error.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/alert/alert.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/auth/has-any-authority.directive.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/auth/has-any-authority.directive.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/auth/has-any-authority.directive.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/auth/has-any-authority.directive.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/error.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/error.constants.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/error.constants.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/error.constants.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/input.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/input.constants.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/input.constants.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/input.constants.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/pagination.constants.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/pagination.constants.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/pagination.constants.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/constants/pagination.constants.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/index.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/index.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/index.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/index.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/login/login.component.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/model/quotes/quote.model.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/model/quotes/quote.model.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/model/quotes/quote.model.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/model/quotes/quote.model.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-common.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-common.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-common.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-common.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-libs.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-libs.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-libs.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared-libs.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/shared.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/shared.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/util/datepicker-adapter.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/util/datepicker-adapter.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/util/datepicker-adapter.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/util/datepicker-adapter.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/util/request-util.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/util/request-util.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/shared/util/request-util.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/shared/util/request-util.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/app/vendor.ts b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/vendor.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/app/vendor.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/app/vendor.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster.png
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster.png
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster.png
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster192.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster192.png
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster192.png
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster192.png
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster256.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster256.png
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster256.png
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster256.png
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster2x.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster2x.png
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster2x.png
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster2x.png
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster384.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster384.png
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster384.png
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster384.png
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster512.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster512.png
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/hipster512.png
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/hipster512.png
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/logo-jhipster.png b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/logo-jhipster.png
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/images/logo-jhipster.png
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/images/logo-jhipster.png
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/_bootstrap-variables.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/_bootstrap-variables.scss
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/_bootstrap-variables.scss
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/_bootstrap-variables.scss
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/global.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/global.scss
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/global.scss
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/global.scss
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/vendor.scss b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/vendor.scss
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/content/scss/vendor.scss
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/content/scss/vendor.scss
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/favicon.ico b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/favicon.ico
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/favicon.ico
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/favicon.ico
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/activate.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/activate.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/activate.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/activate.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/audits.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/audits.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/audits.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/audits.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/configuration.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/configuration.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/configuration.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/configuration.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/error.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/error.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/error.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/error.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/gateway.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/gateway.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/gateway.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/gateway.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/global.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/global.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/global.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/global.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/health.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/health.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/health.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/health.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/home.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/home.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/home.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/home.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/login.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/login.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/login.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/login.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/logs.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/logs.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/logs.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/logs.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/metrics.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/metrics.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/metrics.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/metrics.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/password.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/password.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/password.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/password.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/quotesQuote.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/quotesQuote.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/quotesQuote.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/quotesQuote.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/register.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/register.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/register.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/register.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/reset.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/reset.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/reset.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/reset.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/sessions.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/sessions.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/sessions.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/sessions.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/settings.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/settings.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/settings.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/settings.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/user-management.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/user-management.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/en/user-management.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/en/user-management.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/activate.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/activate.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/activate.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/activate.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/audits.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/audits.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/audits.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/audits.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/configuration.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/configuration.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/configuration.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/configuration.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/error.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/error.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/error.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/error.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/gateway.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/gateway.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/gateway.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/gateway.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/global.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/global.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/global.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/global.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/health.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/health.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/health.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/health.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/home.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/home.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/home.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/home.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/login.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/login.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/login.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/login.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/logs.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/logs.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/logs.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/logs.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/metrics.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/metrics.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/metrics.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/metrics.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/password.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/password.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/password.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/password.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/quotesQuote.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/quotesQuote.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/quotesQuote.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/quotesQuote.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/register.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/register.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/register.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/register.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/reset.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/reset.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/reset.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/reset.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/sessions.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/sessions.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/sessions.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/sessions.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/settings.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/settings.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/settings.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/settings.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/user-management.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/user-management.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/fr/user-management.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/fr/user-management.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/activate.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/activate.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/activate.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/activate.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/audits.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/audits.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/audits.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/audits.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/configuration.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/configuration.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/configuration.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/configuration.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/error.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/error.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/error.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/error.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/gateway.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/gateway.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/gateway.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/gateway.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/global.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/global.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/global.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/global.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/health.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/health.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/health.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/health.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/home.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/home.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/home.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/home.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/login.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/login.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/login.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/login.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/logs.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/logs.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/logs.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/logs.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/metrics.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/metrics.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/metrics.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/metrics.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/password.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/password.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/password.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/password.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/quotesQuote.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/quotesQuote.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/quotesQuote.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/quotesQuote.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/register.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/register.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/register.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/register.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/reset.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/reset.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/reset.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/reset.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/sessions.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/sessions.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/sessions.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/sessions.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/settings.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/settings.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/settings.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/settings.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/user-management.json b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/user-management.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/user-management.json
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/i18n/pt-br/user-management.json
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/index.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/index.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/index.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/index.html
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/manifest.webapp b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/manifest.webapp
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/manifest.webapp
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/manifest.webapp
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/robots.txt b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/robots.txt
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/robots.txt
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/robots.txt
diff --git a/jhipster/jhipster-uaa/gateway/src/main/webapp/swagger-ui/index.html b/jhipster-modules/jhipster-uaa/gateway/src/main/webapp/swagger-ui/index.html
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/main/webapp/swagger-ui/index.html
rename to jhipster-modules/jhipster-uaa/gateway/src/main/webapp/swagger-ui/index.html
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/SecurityBeanOverrideConfiguration.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/SecurityBeanOverrideConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/SecurityBeanOverrideConfiguration.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/SecurityBeanOverrideConfiguration.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerTestController.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerTestController.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerTestController.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerTestController.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerUnitTest.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/config/WebConfigurerUnitTest.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterUnitTest.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterUnitTest.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/OAuth2TokenMockUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/OAuth2TokenMockUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/OAuth2TokenMockUtil.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/OAuth2TokenMockUtil.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollectionUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollectionUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollectionUnitTest.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieCollectionUnitTest.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractorUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractorUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractorUnitTest.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/CookieTokenExtractorUnitTest.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationServiceUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationServiceUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationServiceUnitTest.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2AuthenticationServiceUnitTest.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelperUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelperUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelperUnitTest.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/security/oauth2/OAuth2CookieHelperUnitTest.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/LogsResourceIntTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/LogsResourceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/LogsResourceIntTest.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/LogsResourceIntTest.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/TestUtil.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/TestUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/TestUtil.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/TestUtil.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorIntTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorIntTest.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorIntTest.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorTestController.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorTestController.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorTestController.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/errors/ExceptionTranslatorTestController.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtilUnitTest.java b/jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtilUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtilUnitTest.java
rename to jhipster-modules/jhipster-uaa/gateway/src/test/java/com/baeldung/jhipster/gateway/web/rest/util/PaginationUtilUnitTest.java
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/jest-global-mocks.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest-global-mocks.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/jest-global-mocks.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest-global-mocks.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/jest.conf.js b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest.conf.js
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/jest.conf.js
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest.conf.js
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/jest.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/jest.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/jest.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/activate/activate.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/activate/activate.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/activate/activate.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/activate/activate.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/password/password.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/register/register.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/register/register.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/register/register.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/register/register.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/settings/settings.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/settings/settings.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/account/settings/settings.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/account/settings/settings.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/health/health.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/health/health.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/health/health.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/health/health.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics-modal.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics-modal.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics-modal.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics-modal.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/core/user/user.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/core/user/user.service.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/core/user/user.service.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/core/user/user.service.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-delete-dialog.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-delete-dialog.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-delete-dialog.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-delete-dialog.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-detail.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-detail.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-detail.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-detail.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-update.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-update.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-update.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote-update.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.service.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.service.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.service.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/entities/quotes/quote/quote.service.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/login/login.component.spec.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/login/login.component.spec.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/login/login.component.spec.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/app/shared/login/login.component.spec.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-account.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-account.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-account.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-account.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-active-modal.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-active-modal.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-active-modal.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-active-modal.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-alert.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-alert.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-alert.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-alert.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-event-manager.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-event-manager.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-event-manager.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-event-manager.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-language.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-language.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-language.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-language.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-login.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-login.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-login.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-login.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-principal.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-principal.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-principal.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-principal.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-route.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-route.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-route.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-route.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-state-storage.service.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-state-storage.service.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-state-storage.service.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/mock-state-storage.service.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/spyobject.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/spyobject.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/helpers/spyobject.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/helpers/spyobject.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/javascript/spec/test.module.ts b/jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/test.module.ts
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/javascript/spec/test.module.ts
rename to jhipster-modules/jhipster-uaa/gateway/src/test/javascript/spec/test.module.ts
diff --git a/jhipster/jhipster-uaa/gateway/src/test/resources/config/application.yml b/jhipster-modules/jhipster-uaa/gateway/src/test/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/resources/config/application.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/test/resources/config/application.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/gateway/src/test/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-uaa/gateway/src/test/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-uaa/gateway/src/test/resources/logback.xml b/jhipster-modules/jhipster-uaa/gateway/src/test/resources/logback.xml
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/src/test/resources/logback.xml
rename to jhipster-modules/jhipster-uaa/gateway/src/test/resources/logback.xml
diff --git a/jhipster/jhipster-uaa/gateway/tsconfig-aot.json b/jhipster-modules/jhipster-uaa/gateway/tsconfig-aot.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/tsconfig-aot.json
rename to jhipster-modules/jhipster-uaa/gateway/tsconfig-aot.json
diff --git a/jhipster/jhipster-uaa/gateway/tsconfig.json b/jhipster-modules/jhipster-uaa/gateway/tsconfig.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/tsconfig.json
rename to jhipster-modules/jhipster-uaa/gateway/tsconfig.json
diff --git a/jhipster/jhipster-uaa/gateway/tslint.json b/jhipster-modules/jhipster-uaa/gateway/tslint.json
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/tslint.json
rename to jhipster-modules/jhipster-uaa/gateway/tslint.json
diff --git a/jhipster/jhipster-uaa/gateway/webpack/logo-jhipster.png b/jhipster-modules/jhipster-uaa/gateway/webpack/logo-jhipster.png
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/webpack/logo-jhipster.png
rename to jhipster-modules/jhipster-uaa/gateway/webpack/logo-jhipster.png
diff --git a/jhipster/jhipster-uaa/gateway/webpack/utils.js b/jhipster-modules/jhipster-uaa/gateway/webpack/utils.js
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/webpack/utils.js
rename to jhipster-modules/jhipster-uaa/gateway/webpack/utils.js
diff --git a/jhipster/jhipster-uaa/gateway/webpack/webpack.common.js b/jhipster-modules/jhipster-uaa/gateway/webpack/webpack.common.js
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/webpack/webpack.common.js
rename to jhipster-modules/jhipster-uaa/gateway/webpack/webpack.common.js
diff --git a/jhipster/jhipster-uaa/gateway/webpack/webpack.dev.js b/jhipster-modules/jhipster-uaa/gateway/webpack/webpack.dev.js
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/webpack/webpack.dev.js
rename to jhipster-modules/jhipster-uaa/gateway/webpack/webpack.dev.js
diff --git a/jhipster/jhipster-uaa/gateway/webpack/webpack.prod.js b/jhipster-modules/jhipster-uaa/gateway/webpack/webpack.prod.js
similarity index 100%
rename from jhipster/jhipster-uaa/gateway/webpack/webpack.prod.js
rename to jhipster-modules/jhipster-uaa/gateway/webpack/webpack.prod.js
diff --git a/jhipster/jhipster-uaa/pom.xml b/jhipster-modules/jhipster-uaa/pom.xml
similarity index 92%
rename from jhipster/jhipster-uaa/pom.xml
rename to jhipster-modules/jhipster-uaa/pom.xml
index a59b19d1fdea..b90b59047db9 100644
--- a/jhipster/jhipster-uaa/pom.xml
+++ b/jhipster-modules/jhipster-uaa/pom.xml
@@ -7,7 +7,7 @@
     <packaging>pom</packaging>
 
 	<parent>
-        <artifactId>jhipster</artifactId>
+        <artifactId>jhipster-modules</artifactId>
         <groupId>com.baeldung.jhipster</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
diff --git a/jhipster/jhipster-uaa/quotes/.editorconfig b/jhipster-modules/jhipster-uaa/quotes/.editorconfig
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/.editorconfig
rename to jhipster-modules/jhipster-uaa/quotes/.editorconfig
diff --git a/jhipster/jhipster-uaa/quotes/.gitattributes b/jhipster-modules/jhipster-uaa/quotes/.gitattributes
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/.gitattributes
rename to jhipster-modules/jhipster-uaa/quotes/.gitattributes
diff --git a/jhipster/jhipster-uaa/quotes/.gitignore b/jhipster-modules/jhipster-uaa/quotes/.gitignore
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/.gitignore
rename to jhipster-modules/jhipster-uaa/quotes/.gitignore
diff --git a/jhipster/jhipster-uaa/quotes/.jhipster/Quote.json b/jhipster-modules/jhipster-uaa/quotes/.jhipster/Quote.json
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/.jhipster/Quote.json
rename to jhipster-modules/jhipster-uaa/quotes/.jhipster/Quote.json
diff --git a/jhipster/jhipster-uaa/quotes/.mvn/wrapper/MavenWrapperDownloader.java b/jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/.mvn/wrapper/MavenWrapperDownloader.java
rename to jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/jhipster/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.jar
rename to jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.jar
diff --git a/jhipster/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.properties
rename to jhipster-modules/jhipster-uaa/quotes/.mvn/wrapper/maven-wrapper.properties
diff --git a/jhipster/jhipster-uaa/quotes/.yo-rc.json b/jhipster-modules/jhipster-uaa/quotes/.yo-rc.json
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/.yo-rc.json
rename to jhipster-modules/jhipster-uaa/quotes/.yo-rc.json
diff --git a/jhipster/jhipster-uaa/quotes/README.md b/jhipster-modules/jhipster-uaa/quotes/README.md
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/README.md
rename to jhipster-modules/jhipster-uaa/quotes/README.md
diff --git a/jhipster/jhipster-uaa/quotes/mvnw b/jhipster-modules/jhipster-uaa/quotes/mvnw
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/mvnw
rename to jhipster-modules/jhipster-uaa/quotes/mvnw
diff --git a/jhipster/jhipster-uaa/quotes/mvnw.cmd b/jhipster-modules/jhipster-uaa/quotes/mvnw.cmd
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/mvnw.cmd
rename to jhipster-modules/jhipster-uaa/quotes/mvnw.cmd
diff --git a/jhipster/jhipster-uaa/quotes/package-lock.json b/jhipster-modules/jhipster-uaa/quotes/package-lock.json
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/package-lock.json
rename to jhipster-modules/jhipster-uaa/quotes/package-lock.json
diff --git a/jhipster/jhipster-uaa/quotes/package.json b/jhipster-modules/jhipster-uaa/quotes/package.json
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/package.json
rename to jhipster-modules/jhipster-uaa/quotes/package.json
diff --git a/jhipster/jhipster-uaa/quotes/pom.xml b/jhipster-modules/jhipster-uaa/quotes/pom.xml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/pom.xml
rename to jhipster-modules/jhipster-uaa/quotes/pom.xml
diff --git a/jhipster/jhipster-uaa/quotes/quotes.jh b/jhipster-modules/jhipster-uaa/quotes/quotes.jh
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/quotes.jh
rename to jhipster-modules/jhipster-uaa/quotes/quotes.jh
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/.dockerignore b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/.dockerignore
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/.dockerignore
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/.dockerignore
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/Dockerfile b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/Dockerfile
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/Dockerfile
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/Dockerfile
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/app.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/app.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/app.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/app.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/README.md
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/README.md
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/README.md
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/docker-config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/docker-config/application.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/docker-config/application.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/localhost-config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/central-server-config/localhost-config/application.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/central-server-config/localhost-config/application.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/entrypoint.sh b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/entrypoint.sh
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/entrypoint.sh
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/entrypoint.sh
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/hazelcast-management-center.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/hazelcast-management-center.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/hazelcast-management-center.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/hazelcast-management-center.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/jhipster-registry.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/jhipster-registry.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/jhipster-registry.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/mysql.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/mysql.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/mysql.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/mysql.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/docker/sonar.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/docker/sonar.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/docker/sonar.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/docker/sonar.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/ApplicationWebXml.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/ApplicationWebXml.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/ApplicationWebXml.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/ApplicationWebXml.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/QuotesApp.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/QuotesApp.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/QuotesApp.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/QuotesApp.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/aop/logging/LoggingAspect.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/aop/logging/LoggingAspect.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/aop/logging/LoggingAspect.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedFeignClient.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedFeignClient.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedFeignClient.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedFeignClient.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedUserFeignClient.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedUserFeignClient.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedUserFeignClient.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/AuthorizedUserFeignClient.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2InterceptedFeignConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2InterceptedFeignConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2InterceptedFeignConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2InterceptedFeignConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2UserClientFeignConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2UserClientFeignConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2UserClientFeignConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/OAuth2UserClientFeignConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/UserFeignClientInterceptor.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/UserFeignClientInterceptor.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/UserFeignClientInterceptor.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/client/UserFeignClientInterceptor.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/ApplicationProperties.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/ApplicationProperties.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/ApplicationProperties.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/ApplicationProperties.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/AsyncConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/AsyncConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/AsyncConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/AsyncConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CacheConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CacheConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CacheConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CacheConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CloudDatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CloudDatabaseConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/CloudDatabaseConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/Constants.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/Constants.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/Constants.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/Constants.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DatabaseConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DatabaseConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DateTimeFormatConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DateTimeFormatConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DateTimeFormatConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DefaultProfileUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DefaultProfileUtil.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/DefaultProfileUtil.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/FeignConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/FeignConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/FeignConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/FeignConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/JacksonConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/JacksonConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/JacksonConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/JacksonConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LiquibaseConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LiquibaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LiquibaseConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LiquibaseConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LocaleConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LocaleConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LocaleConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LocaleConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingAspectConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingAspectConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingAspectConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/LoggingConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/MetricsConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/MetricsConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/MetricsConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/MetricsConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/SecurityConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/SecurityConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/SecurityConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/SecurityConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/WebConfigurer.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/WebConfigurer.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/WebConfigurer.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/WebConfigurer.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/AuditEventConverter.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/AuditEventConverter.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/AuditEventConverter.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/package-info.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/audit/package-info.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2JwtAccessTokenConverter.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2JwtAccessTokenConverter.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2JwtAccessTokenConverter.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2JwtAccessTokenConverter.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2Properties.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2Properties.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2Properties.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/oauth2/OAuth2Properties.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/package-info.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/config/package-info.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/AbstractAuditingEntity.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/AbstractAuditingEntity.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/AbstractAuditingEntity.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/PersistentAuditEvent.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/PersistentAuditEvent.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/PersistentAuditEvent.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/Quote.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/Quote.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/Quote.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/Quote.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/package-info.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/domain/package-info.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/QuoteRepository.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/QuoteRepository.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/QuoteRepository.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/QuoteRepository.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/package-info.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/repository/package-info.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/AuthoritiesConstants.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/AuthoritiesConstants.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/AuthoritiesConstants.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SecurityUtils.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SecurityUtils.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SecurityUtils.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SecurityUtils.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SpringSecurityAuditorAware.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SpringSecurityAuditorAware.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/SpringSecurityAuditorAware.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/OAuth2SignatureVerifierClient.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/OAuth2SignatureVerifierClient.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/OAuth2SignatureVerifierClient.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/OAuth2SignatureVerifierClient.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/UaaSignatureVerifierClient.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/UaaSignatureVerifierClient.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/UaaSignatureVerifierClient.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/oauth2/UaaSignatureVerifierClient.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/package-info.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/security/package-info.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteQueryService.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteQueryService.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteQueryService.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteQueryService.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteService.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteService.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteService.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/QuoteService.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteCriteria.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteCriteria.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteCriteria.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteCriteria.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteDTO.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteDTO.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteDTO.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/dto/QuoteDTO.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/impl/QuoteServiceImpl.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/impl/QuoteServiceImpl.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/impl/QuoteServiceImpl.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/impl/QuoteServiceImpl.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/EntityMapper.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/EntityMapper.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/EntityMapper.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/EntityMapper.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/QuoteMapper.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/QuoteMapper.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/QuoteMapper.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/mapper/QuoteMapper.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/package-info.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/service/package-info.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/LogsResource.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/LogsResource.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/LogsResource.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/LogsResource.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/QuoteResource.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/QuoteResource.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/QuoteResource.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/QuoteResource.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/BadRequestAlertException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/BadRequestAlertException.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/BadRequestAlertException.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/BadRequestAlertException.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/CustomParameterizedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/CustomParameterizedException.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/CustomParameterizedException.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailAlreadyUsedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailAlreadyUsedException.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailAlreadyUsedException.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailNotFoundException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailNotFoundException.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailNotFoundException.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/EmailNotFoundException.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ErrorConstants.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ErrorConstants.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ErrorConstants.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslator.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslator.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslator.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/FieldErrorVM.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/FieldErrorVM.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/FieldErrorVM.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InternalServerErrorException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InternalServerErrorException.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InternalServerErrorException.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InternalServerErrorException.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InvalidPasswordException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InvalidPasswordException.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InvalidPasswordException.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/InvalidPasswordException.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/LoginAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/LoginAlreadyUsedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/LoginAlreadyUsedException.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/LoginAlreadyUsedException.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/package-info.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/errors/package-info.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/package-info.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/package-info.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/HeaderUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/HeaderUtil.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/HeaderUtil.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtil.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtil.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/LoggerVM.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/LoggerVM.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/LoggerVM.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/package-info.java b/jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/package-info.java
rename to jhipster-modules/jhipster-uaa/quotes/src/main/java/com/baeldung/jhipster/quotes/web/rest/vm/package-info.java
diff --git a/jhipster/jhipster-uaa/quotes/src/main/jib/entrypoint.sh b/jhipster-modules/jhipster-uaa/quotes/src/main/jib/entrypoint.sh
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/jib/entrypoint.sh
rename to jhipster-modules/jhipster-uaa/quotes/src/main/jib/entrypoint.sh
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/.h2.server.properties
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/.h2.server.properties
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/.h2.server.properties
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/banner.txt b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/banner.txt
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/banner.txt
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/banner.txt
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-dev.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/application-dev.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-dev.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-prod.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/application-prod.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-prod.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/application-tls.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-tls.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/application-tls.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application-tls.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/application.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/application.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/application.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/bootstrap-prod.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/bootstrap-prod.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/bootstrap-prod.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/20181019033648_added_entity_Quote.xml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/20181019033648_added_entity_Quote.xml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/20181019033648_added_entity_Quote.xml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/changelog/20181019033648_added_entity_Quote.xml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/master.xml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/liquibase/master.xml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/liquibase/master.xml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/config/tls/keystore.p12 b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/tls/keystore.p12
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/config/tls/keystore.p12
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/config/tls/keystore.p12
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/i18n/messages.properties
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/i18n/messages.properties
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/i18n/messages.properties
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/i18n/messages_en.properties
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/i18n/messages_en.properties
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/i18n/messages_en.properties
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/logback-spring.xml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/logback-spring.xml
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/logback-spring.xml
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/static/index.html b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/static/index.html
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/static/index.html
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/static/index.html
diff --git a/jhipster/jhipster-uaa/quotes/src/main/resources/templates/error.html b/jhipster-modules/jhipster-uaa/quotes/src/main/resources/templates/error.html
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/main/resources/templates/error.html
rename to jhipster-modules/jhipster-uaa/quotes/src/main/resources/templates/error.html
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/SecurityBeanOverrideConfiguration.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/SecurityBeanOverrideConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/SecurityBeanOverrideConfiguration.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/SecurityBeanOverrideConfiguration.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerTestController.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerTestController.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerTestController.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerTestController.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerUnitTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerUnitTest.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/config/WebConfigurerUnitTest.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/security/OAuth2TokenMockUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/security/OAuth2TokenMockUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/security/OAuth2TokenMockUtil.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/security/OAuth2TokenMockUtil.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/LogsResourceIntTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/LogsResourceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/LogsResourceIntTest.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/LogsResourceIntTest.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/QuoteResourceIntTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/QuoteResourceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/QuoteResourceIntTest.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/QuoteResourceIntTest.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/TestUtil.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/TestUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/TestUtil.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/TestUtil.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorIntTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorIntTest.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorIntTest.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorTestController.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorTestController.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorTestController.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/errors/ExceptionTranslatorTestController.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtilUnitTest.java b/jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtilUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtilUnitTest.java
rename to jhipster-modules/jhipster-uaa/quotes/src/test/java/com/baeldung/jhipster/quotes/web/rest/util/PaginationUtilUnitTest.java
diff --git a/jhipster/jhipster-uaa/quotes/src/test/resources/config/application.yml b/jhipster-modules/jhipster-uaa/quotes/src/test/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/resources/config/application.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/test/resources/config/application.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/quotes/src/test/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-uaa/quotes/src/test/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-uaa/quotes/src/test/resources/logback.xml b/jhipster-modules/jhipster-uaa/quotes/src/test/resources/logback.xml
similarity index 100%
rename from jhipster/jhipster-uaa/quotes/src/test/resources/logback.xml
rename to jhipster-modules/jhipster-uaa/quotes/src/test/resources/logback.xml
diff --git a/jhipster/jhipster-uaa/uaa/.editorconfig b/jhipster-modules/jhipster-uaa/uaa/.editorconfig
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/.editorconfig
rename to jhipster-modules/jhipster-uaa/uaa/.editorconfig
diff --git a/jhipster/jhipster-uaa/uaa/.gitattributes b/jhipster-modules/jhipster-uaa/uaa/.gitattributes
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/.gitattributes
rename to jhipster-modules/jhipster-uaa/uaa/.gitattributes
diff --git a/jhipster/jhipster-uaa/uaa/.gitignore b/jhipster-modules/jhipster-uaa/uaa/.gitignore
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/.gitignore
rename to jhipster-modules/jhipster-uaa/uaa/.gitignore
diff --git a/jhipster/jhipster-uaa/uaa/.mvn/wrapper/MavenWrapperDownloader.java b/jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/.mvn/wrapper/MavenWrapperDownloader.java
rename to jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/jhipster/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.jar b/jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.jar
rename to jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.jar
diff --git a/jhipster/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.properties b/jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.properties
rename to jhipster-modules/jhipster-uaa/uaa/.mvn/wrapper/maven-wrapper.properties
diff --git a/jhipster/jhipster-uaa/uaa/.yo-rc.json b/jhipster-modules/jhipster-uaa/uaa/.yo-rc.json
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/.yo-rc.json
rename to jhipster-modules/jhipster-uaa/uaa/.yo-rc.json
diff --git a/jhipster/jhipster-uaa/uaa/README.md b/jhipster-modules/jhipster-uaa/uaa/README.md
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/README.md
rename to jhipster-modules/jhipster-uaa/uaa/README.md
diff --git a/jhipster/jhipster-uaa/uaa/mvnw b/jhipster-modules/jhipster-uaa/uaa/mvnw
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/mvnw
rename to jhipster-modules/jhipster-uaa/uaa/mvnw
diff --git a/jhipster/jhipster-uaa/uaa/mvnw.cmd b/jhipster-modules/jhipster-uaa/uaa/mvnw.cmd
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/mvnw.cmd
rename to jhipster-modules/jhipster-uaa/uaa/mvnw.cmd
diff --git a/jhipster/jhipster-uaa/uaa/package-lock.json b/jhipster-modules/jhipster-uaa/uaa/package-lock.json
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/package-lock.json
rename to jhipster-modules/jhipster-uaa/uaa/package-lock.json
diff --git a/jhipster/jhipster-uaa/uaa/package.json b/jhipster-modules/jhipster-uaa/uaa/package.json
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/package.json
rename to jhipster-modules/jhipster-uaa/uaa/package.json
diff --git a/jhipster/jhipster-uaa/uaa/pom.xml b/jhipster-modules/jhipster-uaa/uaa/pom.xml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/pom.xml
rename to jhipster-modules/jhipster-uaa/uaa/pom.xml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/.dockerignore b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/.dockerignore
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/.dockerignore
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/.dockerignore
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/Dockerfile b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/Dockerfile
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/Dockerfile
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/Dockerfile
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/app.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/app.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/app.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/app.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/README.md b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/README.md
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/README.md
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/README.md
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/docker-config/application.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/docker-config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/docker-config/application.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/docker-config/application.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/localhost-config/application.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/localhost-config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/central-server-config/localhost-config/application.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/central-server-config/localhost-config/application.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/entrypoint.sh b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/entrypoint.sh
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/entrypoint.sh
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/entrypoint.sh
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/hazelcast-management-center.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/hazelcast-management-center.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/hazelcast-management-center.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/hazelcast-management-center.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/jhipster-registry.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/jhipster-registry.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/jhipster-registry.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/jhipster-registry.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/mysql.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/mysql.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/mysql.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/mysql.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/docker/sonar.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/docker/sonar.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/docker/sonar.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/docker/sonar.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/ApplicationWebXml.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/ApplicationWebXml.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/ApplicationWebXml.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/ApplicationWebXml.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/UaaApp.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/UaaApp.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/UaaApp.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/UaaApp.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/aop/logging/LoggingAspect.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/aop/logging/LoggingAspect.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/aop/logging/LoggingAspect.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/aop/logging/LoggingAspect.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/ApplicationProperties.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/ApplicationProperties.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/ApplicationProperties.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/ApplicationProperties.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/AsyncConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/AsyncConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/AsyncConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/AsyncConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CacheConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CacheConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CacheConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CacheConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CloudDatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CloudDatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CloudDatabaseConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/CloudDatabaseConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/Constants.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/Constants.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/Constants.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/Constants.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DatabaseConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DatabaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DatabaseConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DatabaseConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DateTimeFormatConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DateTimeFormatConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DateTimeFormatConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DateTimeFormatConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DefaultProfileUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DefaultProfileUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DefaultProfileUtil.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/DefaultProfileUtil.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/JacksonConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/JacksonConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/JacksonConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/JacksonConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LiquibaseConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LiquibaseConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LiquibaseConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LiquibaseConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LocaleConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LocaleConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LocaleConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LocaleConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingAspectConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingAspectConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingAspectConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingAspectConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/LoggingConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/MetricsConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/MetricsConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/MetricsConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/MetricsConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaProperties.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaProperties.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaProperties.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaProperties.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaWebSecurityConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaWebSecurityConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaWebSecurityConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/UaaWebSecurityConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/WebConfigurer.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/WebConfigurer.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/WebConfigurer.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/WebConfigurer.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/AuditEventConverter.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/AuditEventConverter.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/AuditEventConverter.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/AuditEventConverter.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/audit/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/config/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/AbstractAuditingEntity.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/AbstractAuditingEntity.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/AbstractAuditingEntity.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/AbstractAuditingEntity.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/Authority.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/Authority.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/Authority.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/Authority.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/PersistentAuditEvent.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/PersistentAuditEvent.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/PersistentAuditEvent.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/PersistentAuditEvent.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/User.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/User.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/User.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/User.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/domain/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/AuthorityRepository.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/AuthorityRepository.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/AuthorityRepository.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/AuthorityRepository.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepository.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepository.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepository.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepository.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/PersistenceAuditEventRepository.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/PersistenceAuditEventRepository.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/PersistenceAuditEventRepository.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/PersistenceAuditEventRepository.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/UserRepository.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/UserRepository.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/UserRepository.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/UserRepository.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/repository/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/AuthoritiesConstants.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/AuthoritiesConstants.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/AuthoritiesConstants.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/AuthoritiesConstants.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsService.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsService.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsService.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsService.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/IatTokenEnhancer.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/IatTokenEnhancer.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/IatTokenEnhancer.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/IatTokenEnhancer.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SecurityUtils.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SecurityUtils.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SecurityUtils.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SecurityUtils.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SpringSecurityAuditorAware.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SpringSecurityAuditorAware.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SpringSecurityAuditorAware.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/SpringSecurityAuditorAware.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/UserNotActivatedException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/UserNotActivatedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/UserNotActivatedException.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/UserNotActivatedException.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/security/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/AuditEventService.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/AuditEventService.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/AuditEventService.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/AuditEventService.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/MailService.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/MailService.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/MailService.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/MailService.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/UserService.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/UserService.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/UserService.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/UserService.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/PasswordChangeDTO.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/PasswordChangeDTO.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/PasswordChangeDTO.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/PasswordChangeDTO.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/UserDTO.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/UserDTO.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/UserDTO.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/UserDTO.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/dto/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/UserMapper.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/UserMapper.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/UserMapper.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/UserMapper.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/mapper/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/util/RandomUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/util/RandomUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/util/RandomUtil.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/service/util/RandomUtil.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AccountResource.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AccountResource.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AccountResource.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AccountResource.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AuditResource.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AuditResource.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AuditResource.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/AuditResource.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/LogsResource.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/LogsResource.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/LogsResource.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/LogsResource.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/UserResource.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/UserResource.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/UserResource.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/UserResource.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/BadRequestAlertException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/BadRequestAlertException.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/BadRequestAlertException.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/BadRequestAlertException.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/CustomParameterizedException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/CustomParameterizedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/CustomParameterizedException.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/CustomParameterizedException.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailAlreadyUsedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailAlreadyUsedException.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailAlreadyUsedException.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailNotFoundException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailNotFoundException.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailNotFoundException.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/EmailNotFoundException.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ErrorConstants.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ErrorConstants.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ErrorConstants.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ErrorConstants.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslator.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslator.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslator.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslator.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/FieldErrorVM.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/FieldErrorVM.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/FieldErrorVM.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/FieldErrorVM.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InternalServerErrorException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InternalServerErrorException.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InternalServerErrorException.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InternalServerErrorException.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InvalidPasswordException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InvalidPasswordException.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InvalidPasswordException.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/InvalidPasswordException.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/LoginAlreadyUsedException.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/LoginAlreadyUsedException.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/LoginAlreadyUsedException.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/LoginAlreadyUsedException.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/errors/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/HeaderUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/HeaderUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/HeaderUtil.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/HeaderUtil.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtil.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtil.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/KeyAndPasswordVM.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/KeyAndPasswordVM.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/KeyAndPasswordVM.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/KeyAndPasswordVM.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/LoggerVM.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/LoggerVM.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/LoggerVM.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/LoggerVM.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/ManagedUserVM.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/ManagedUserVM.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/ManagedUserVM.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/ManagedUserVM.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/package-info.java b/jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/package-info.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/package-info.java
rename to jhipster-modules/jhipster-uaa/uaa/src/main/java/com/baeldung/jhipster/uaa/web/rest/vm/package-info.java
diff --git a/jhipster/jhipster-uaa/uaa/src/main/jib/entrypoint.sh b/jhipster-modules/jhipster-uaa/uaa/src/main/jib/entrypoint.sh
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/jib/entrypoint.sh
rename to jhipster-modules/jhipster-uaa/uaa/src/main/jib/entrypoint.sh
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/.h2.server.properties b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/.h2.server.properties
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/.h2.server.properties
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/.h2.server.properties
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/banner.txt b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/banner.txt
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/banner.txt
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/banner.txt
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/application-dev.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-dev.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/application-dev.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-dev.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/application-prod.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-prod.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/application-prod.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-prod.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/application-tls.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-tls.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/application-tls.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application-tls.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/application.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/application.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/application.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/bootstrap-prod.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/bootstrap-prod.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/bootstrap-prod.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/bootstrap-prod.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/authorities.csv b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/authorities.csv
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/authorities.csv
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/authorities.csv
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/master.xml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/master.xml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/master.xml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/master.xml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/users.csv b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/users.csv
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/users.csv
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/users.csv
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/users_authorities.csv b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/users_authorities.csv
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/liquibase/users_authorities.csv
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/liquibase/users_authorities.csv
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/config/tls/keystore.p12 b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/tls/keystore.p12
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/config/tls/keystore.p12
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/config/tls/keystore.p12
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/i18n/messages.properties b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/i18n/messages.properties
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/i18n/messages.properties
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/i18n/messages.properties
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/i18n/messages_en.properties
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/i18n/messages_en.properties
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/i18n/messages_en.properties
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/logback-spring.xml b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/logback-spring.xml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/logback-spring.xml
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/logback-spring.xml
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/templates/error.html b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/error.html
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/templates/error.html
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/error.html
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/activationEmail.html b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/activationEmail.html
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/activationEmail.html
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/activationEmail.html
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/creationEmail.html b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/creationEmail.html
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/creationEmail.html
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/creationEmail.html
diff --git a/jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/passwordResetEmail.html b/jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/passwordResetEmail.html
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/main/resources/templates/mail/passwordResetEmail.html
rename to jhipster-modules/jhipster-uaa/uaa/src/main/resources/templates/mail/passwordResetEmail.html
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/SecurityBeanOverrideConfiguration.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/SecurityBeanOverrideConfiguration.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/SecurityBeanOverrideConfiguration.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/SecurityBeanOverrideConfiguration.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerTestController.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerTestController.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerTestController.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerTestController.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerUnitTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerUnitTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/config/WebConfigurerUnitTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepositoryIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepositoryIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepositoryIntTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/repository/CustomAuditEventRepositoryIntTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsServiceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsServiceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsServiceIntTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/DomainUserDetailsServiceIntTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/OAuth2TokenMockUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/OAuth2TokenMockUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/OAuth2TokenMockUtil.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/OAuth2TokenMockUtil.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/SecurityUtilsUnitTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/SecurityUtilsUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/SecurityUtilsUnitTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/security/SecurityUtilsUnitTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/MailServiceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/MailServiceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/MailServiceIntTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/MailServiceIntTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/UserServiceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/UserServiceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/UserServiceIntTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/service/UserServiceIntTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AccountResourceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AccountResourceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AccountResourceIntTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AccountResourceIntTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AuditResourceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AuditResourceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AuditResourceIntTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/AuditResourceIntTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/LogsResourceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/LogsResourceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/LogsResourceIntTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/LogsResourceIntTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/TestUtil.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/TestUtil.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/TestUtil.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/TestUtil.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/UserResourceIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/UserResourceIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/UserResourceIntTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/UserResourceIntTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorIntTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorIntTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorIntTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorIntTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorTestController.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorTestController.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorTestController.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/errors/ExceptionTranslatorTestController.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtilUnitTest.java b/jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtilUnitTest.java
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtilUnitTest.java
rename to jhipster-modules/jhipster-uaa/uaa/src/test/java/com/baeldung/jhipster/uaa/web/rest/util/PaginationUtilUnitTest.java
diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/config/application.yml b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/config/application.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/resources/config/application.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/config/application.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/config/bootstrap.yml b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/config/bootstrap.yml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/resources/config/bootstrap.yml
rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/config/bootstrap.yml
diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/i18n/messages_en.properties b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/i18n/messages_en.properties
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/resources/i18n/messages_en.properties
rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/i18n/messages_en.properties
diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/logback.xml b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/logback.xml
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/resources/logback.xml
rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/logback.xml
diff --git a/jhipster/jhipster-uaa/uaa/src/test/resources/templates/mail/testEmail.html b/jhipster-modules/jhipster-uaa/uaa/src/test/resources/templates/mail/testEmail.html
similarity index 100%
rename from jhipster/jhipster-uaa/uaa/src/test/resources/templates/mail/testEmail.html
rename to jhipster-modules/jhipster-uaa/uaa/src/test/resources/templates/mail/testEmail.html
diff --git a/jhipster/pom.xml b/jhipster-modules/pom.xml
similarity index 96%
rename from jhipster/pom.xml
rename to jhipster-modules/pom.xml
index 8954ef0703e2..789666ffb687 100644
--- a/jhipster/pom.xml
+++ b/jhipster-modules/pom.xml
@@ -3,9 +3,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.jhipster</groupId>
-    <artifactId>jhipster</artifactId>
+    <artifactId>jhipster-modules</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>jhipster</name>
+    <name>jhipster-modules</name>
     <packaging>pom</packaging>
 
     <parent>
diff --git a/pom.xml b/pom.xml
index 8fa7c1e2b429..5c7b7f0d2f37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,7 +372,7 @@
                 <module>cloud-foundry-uaa</module>
                 <module>code-generation</module>
 
-                <module>core-groovy-modules</module>                
+                <module>core-groovy-modules</module>
 
                 <module>core-java-modules</module>
 
@@ -740,7 +740,8 @@
                 <module>image-processing</module>
 
                 <module>jenkins/plugins</module>
-                <module>jhipster</module>
+                <module>jhipster-modules</module>
+                <module>jhipster-5</module>
                 <module>jws</module>
 
                 <module>libraries</module> <!-- very long running -->
@@ -832,7 +833,7 @@
                 <module>code-generation</module>
 
                 <module>core-groovy-modules</module>
-                
+
                 <module>core-java-modules</module>
 
                 <module>couchbase</module>
@@ -1186,7 +1187,7 @@
                 <module>image-processing</module>
 
                 <module>jenkins/plugins</module>
-                <module>jhipster</module>
+                <module>jhipster-modules</module>
                 <module>jhipster-5</module>
                 <module>jws</module>