diff --git a/feign-with-spring-data-rest/.gitignore b/junit/assumptions/.gitignore similarity index 100% rename from feign-with-spring-data-rest/.gitignore rename to junit/assumptions/.gitignore diff --git a/junit5/README.md b/junit/assumptions/README.md similarity index 100% rename from junit5/README.md rename to junit/assumptions/README.md diff --git a/junit5/build.gradle b/junit/assumptions/build.gradle similarity index 100% rename from junit5/build.gradle rename to junit/assumptions/build.gradle diff --git a/junit5/gradle/wrapper/gradle-wrapper.jar b/junit/assumptions/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from junit5/gradle/wrapper/gradle-wrapper.jar rename to junit/assumptions/gradle/wrapper/gradle-wrapper.jar diff --git a/junit5/gradle/wrapper/gradle-wrapper.properties b/junit/assumptions/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from junit5/gradle/wrapper/gradle-wrapper.properties rename to junit/assumptions/gradle/wrapper/gradle-wrapper.properties diff --git a/feign-with-spring-data-rest/gradlew b/junit/assumptions/gradlew similarity index 100% rename from feign-with-spring-data-rest/gradlew rename to junit/assumptions/gradlew diff --git a/feign-with-spring-data-rest/gradlew.bat b/junit/assumptions/gradlew.bat similarity index 100% rename from feign-with-spring-data-rest/gradlew.bat rename to junit/assumptions/gradlew.bat diff --git a/feign-with-spring-data-rest/src/main/resources/application.yml b/junit/assumptions/src/main/resources/application.yml similarity index 100% rename from feign-with-spring-data-rest/src/main/resources/application.yml rename to junit/assumptions/src/main/resources/application.yml diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/ConnectionChecker.java b/junit/assumptions/src/test/java/com/example/demo/connectionchecking/ConnectionChecker.java similarity index 100% rename from junit5/src/test/java/com/example/demo/connectionchecking/ConnectionChecker.java rename to junit/assumptions/src/test/java/com/example/demo/connectionchecking/ConnectionChecker.java diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit4/AssumingConnection.java b/junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit4/AssumingConnection.java similarity index 100% rename from junit5/src/test/java/com/example/demo/connectionchecking/junit4/AssumingConnection.java rename to junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit4/AssumingConnection.java diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit4/ConnectionCheckingJunit4Test.java b/junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit4/ConnectionCheckingJunit4Test.java similarity index 100% rename from junit5/src/test/java/com/example/demo/connectionchecking/junit4/ConnectionCheckingJunit4Test.java rename to junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit4/ConnectionCheckingJunit4Test.java diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnection.java b/junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnection.java similarity index 100% rename from junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnection.java rename to junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnection.java diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnectionCondition.java b/junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnectionCondition.java similarity index 100% rename from junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnectionCondition.java rename to junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnectionCondition.java diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit5/ConnectionCheckingJunit5Test.java b/junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit5/ConnectionCheckingJunit5Test.java similarity index 100% rename from junit5/src/test/java/com/example/demo/connectionchecking/junit5/ConnectionCheckingJunit5Test.java rename to junit/assumptions/src/test/java/com/example/demo/connectionchecking/junit5/ConnectionCheckingJunit5Test.java diff --git a/junit5/target/pacts/addressClient-customerServiceProvider.json b/junit/assumptions/target/pacts/addressClient-customerServiceProvider.json similarity index 100% rename from junit5/target/pacts/addressClient-customerServiceProvider.json rename to junit/assumptions/target/pacts/addressClient-customerServiceProvider.json diff --git a/pact-angular/.angular-cli.json b/pact/pact-angular/.angular-cli.json similarity index 100% rename from pact-angular/.angular-cli.json rename to pact/pact-angular/.angular-cli.json diff --git a/pact-angular/.editorconfig b/pact/pact-angular/.editorconfig similarity index 100% rename from pact-angular/.editorconfig rename to pact/pact-angular/.editorconfig diff --git a/pact-angular/.gitignore b/pact/pact-angular/.gitignore similarity index 100% rename from pact-angular/.gitignore rename to pact/pact-angular/.gitignore diff --git a/pact-angular/README.md b/pact/pact-angular/README.md similarity index 100% rename from pact-angular/README.md rename to pact/pact-angular/README.md diff --git a/pact-angular/e2e/app.e2e-spec.ts b/pact/pact-angular/e2e/app.e2e-spec.ts similarity index 100% rename from pact-angular/e2e/app.e2e-spec.ts rename to pact/pact-angular/e2e/app.e2e-spec.ts diff --git a/pact-angular/e2e/app.po.ts b/pact/pact-angular/e2e/app.po.ts similarity index 100% rename from pact-angular/e2e/app.po.ts rename to pact/pact-angular/e2e/app.po.ts diff --git a/pact-angular/e2e/tsconfig.e2e.json b/pact/pact-angular/e2e/tsconfig.e2e.json similarity index 100% rename from pact-angular/e2e/tsconfig.e2e.json rename to pact/pact-angular/e2e/tsconfig.e2e.json diff --git a/pact-angular/karma.conf.js b/pact/pact-angular/karma.conf.js similarity index 100% rename from pact-angular/karma.conf.js rename to pact/pact-angular/karma.conf.js diff --git a/pact-angular/package-lock.json b/pact/pact-angular/package-lock.json similarity index 100% rename from pact-angular/package-lock.json rename to pact/pact-angular/package-lock.json diff --git a/pact-angular/package.json b/pact/pact-angular/package.json similarity index 100% rename from pact-angular/package.json rename to pact/pact-angular/package.json diff --git a/pact-angular/pacts/ui-userservice.json b/pact/pact-angular/pacts/ui-userservice.json similarity index 100% rename from pact-angular/pacts/ui-userservice.json rename to pact/pact-angular/pacts/ui-userservice.json diff --git a/pact-angular/protractor.conf.js b/pact/pact-angular/protractor.conf.js similarity index 100% rename from pact-angular/protractor.conf.js rename to pact/pact-angular/protractor.conf.js diff --git a/pact-angular/publish-pacts.js b/pact/pact-angular/publish-pacts.js similarity index 100% rename from pact-angular/publish-pacts.js rename to pact/pact-angular/publish-pacts.js diff --git a/pact-angular/src/app/app.component.css b/pact/pact-angular/src/app/app.component.css similarity index 100% rename from pact-angular/src/app/app.component.css rename to pact/pact-angular/src/app/app.component.css diff --git a/pact-angular/src/app/app.component.html b/pact/pact-angular/src/app/app.component.html similarity index 100% rename from pact-angular/src/app/app.component.html rename to pact/pact-angular/src/app/app.component.html diff --git a/pact-angular/src/app/app.component.spec.ts b/pact/pact-angular/src/app/app.component.spec.ts similarity index 100% rename from pact-angular/src/app/app.component.spec.ts rename to pact/pact-angular/src/app/app.component.spec.ts diff --git a/pact-angular/src/app/app.component.ts b/pact/pact-angular/src/app/app.component.ts similarity index 100% rename from pact-angular/src/app/app.component.ts rename to pact/pact-angular/src/app/app.component.ts diff --git a/pact-angular/src/app/app.module.ts b/pact/pact-angular/src/app/app.module.ts similarity index 100% rename from pact-angular/src/app/app.module.ts rename to pact/pact-angular/src/app/app.module.ts diff --git a/pact-angular/src/app/page.ts b/pact/pact-angular/src/app/page.ts similarity index 100% rename from pact-angular/src/app/page.ts rename to pact/pact-angular/src/app/page.ts diff --git a/pact-angular/src/app/user.service.pact.spec.ts b/pact/pact-angular/src/app/user.service.pact.spec.ts similarity index 100% rename from pact-angular/src/app/user.service.pact.spec.ts rename to pact/pact-angular/src/app/user.service.pact.spec.ts diff --git a/pact-angular/src/app/user.service.ts b/pact/pact-angular/src/app/user.service.ts similarity index 100% rename from pact-angular/src/app/user.service.ts rename to pact/pact-angular/src/app/user.service.ts diff --git a/pact-angular/src/app/user.ts b/pact/pact-angular/src/app/user.ts similarity index 100% rename from pact-angular/src/app/user.ts rename to pact/pact-angular/src/app/user.ts diff --git a/pact-angular/src/assets/.gitkeep b/pact/pact-angular/src/assets/.gitkeep similarity index 100% rename from pact-angular/src/assets/.gitkeep rename to pact/pact-angular/src/assets/.gitkeep diff --git a/pact-angular/src/environments/environment.prod.ts b/pact/pact-angular/src/environments/environment.prod.ts similarity index 100% rename from pact-angular/src/environments/environment.prod.ts rename to pact/pact-angular/src/environments/environment.prod.ts diff --git a/pact-angular/src/environments/environment.ts b/pact/pact-angular/src/environments/environment.ts similarity index 100% rename from pact-angular/src/environments/environment.ts rename to pact/pact-angular/src/environments/environment.ts diff --git a/pact-angular/src/favicon.ico b/pact/pact-angular/src/favicon.ico similarity index 100% rename from pact-angular/src/favicon.ico rename to pact/pact-angular/src/favicon.ico diff --git a/pact-angular/src/index.html b/pact/pact-angular/src/index.html similarity index 100% rename from pact-angular/src/index.html rename to pact/pact-angular/src/index.html diff --git a/pact-angular/src/main.ts b/pact/pact-angular/src/main.ts similarity index 100% rename from pact-angular/src/main.ts rename to pact/pact-angular/src/main.ts diff --git a/pact-angular/src/polyfills.ts b/pact/pact-angular/src/polyfills.ts similarity index 100% rename from pact-angular/src/polyfills.ts rename to pact/pact-angular/src/polyfills.ts diff --git a/pact-angular/src/styles.css b/pact/pact-angular/src/styles.css similarity index 100% rename from pact-angular/src/styles.css rename to pact/pact-angular/src/styles.css diff --git a/pact-angular/src/test.ts b/pact/pact-angular/src/test.ts similarity index 100% rename from pact-angular/src/test.ts rename to pact/pact-angular/src/test.ts diff --git a/pact-angular/src/tsconfig.app.json b/pact/pact-angular/src/tsconfig.app.json similarity index 100% rename from pact-angular/src/tsconfig.app.json rename to pact/pact-angular/src/tsconfig.app.json diff --git a/pact-angular/src/tsconfig.spec.json b/pact/pact-angular/src/tsconfig.spec.json similarity index 100% rename from pact-angular/src/tsconfig.spec.json rename to pact/pact-angular/src/tsconfig.spec.json diff --git a/pact-angular/src/typings.d.ts b/pact/pact-angular/src/typings.d.ts similarity index 100% rename from pact-angular/src/typings.d.ts rename to pact/pact-angular/src/typings.d.ts diff --git a/pact-angular/tsconfig.json b/pact/pact-angular/tsconfig.json similarity index 100% rename from pact-angular/tsconfig.json rename to pact/pact-angular/tsconfig.json diff --git a/pact-angular/tslint.json b/pact/pact-angular/tslint.json similarity index 100% rename from pact-angular/tslint.json rename to pact/pact-angular/tslint.json diff --git a/junit5/.gitignore b/pact/pact-feign-consumer/.gitignore similarity index 100% rename from junit5/.gitignore rename to pact/pact-feign-consumer/.gitignore diff --git a/pact-feign-consumer/README.md b/pact/pact-feign-consumer/README.md similarity index 100% rename from pact-feign-consumer/README.md rename to pact/pact-feign-consumer/README.md diff --git a/pact-feign-consumer/build.gradle b/pact/pact-feign-consumer/build.gradle similarity index 100% rename from pact-feign-consumer/build.gradle rename to pact/pact-feign-consumer/build.gradle diff --git a/pact-feign-consumer/gradle/wrapper/gradle-wrapper.jar b/pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from pact-feign-consumer/gradle/wrapper/gradle-wrapper.jar rename to pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.jar diff --git a/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties b/pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties rename to pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties diff --git a/junit5/gradlew b/pact/pact-feign-consumer/gradlew similarity index 100% rename from junit5/gradlew rename to pact/pact-feign-consumer/gradlew diff --git a/junit5/gradlew.bat b/pact/pact-feign-consumer/gradlew.bat similarity index 100% rename from junit5/gradlew.bat rename to pact/pact-feign-consumer/gradlew.bat diff --git a/feign-with-spring-data-rest/src/main/java/com/example/demo/Address.java b/pact/pact-feign-consumer/src/main/java/com/example/demo/Address.java similarity index 100% rename from feign-with-spring-data-rest/src/main/java/com/example/demo/Address.java rename to pact/pact-feign-consumer/src/main/java/com/example/demo/Address.java diff --git a/pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java b/pact/pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java similarity index 100% rename from pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java rename to pact/pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java diff --git a/feign-with-spring-data-rest/src/main/java/com/example/demo/Customer.java b/pact/pact-feign-consumer/src/main/java/com/example/demo/Customer.java similarity index 100% rename from feign-with-spring-data-rest/src/main/java/com/example/demo/Customer.java rename to pact/pact-feign-consumer/src/main/java/com/example/demo/Customer.java diff --git a/feign-with-spring-data-rest/src/main/java/com/example/demo/CustomerClient.java b/pact/pact-feign-consumer/src/main/java/com/example/demo/CustomerClient.java similarity index 100% rename from feign-with-spring-data-rest/src/main/java/com/example/demo/CustomerClient.java rename to pact/pact-feign-consumer/src/main/java/com/example/demo/CustomerClient.java diff --git a/pact-feign-consumer/src/main/java/com/example/demo/DemoApplication.java b/pact/pact-feign-consumer/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from pact-feign-consumer/src/main/java/com/example/demo/DemoApplication.java rename to pact/pact-feign-consumer/src/main/java/com/example/demo/DemoApplication.java diff --git a/feign-with-spring-data-rest/src/main/java/com/example/demo/FeignConfiguration.java b/pact/pact-feign-consumer/src/main/java/com/example/demo/FeignConfiguration.java similarity index 100% rename from feign-with-spring-data-rest/src/main/java/com/example/demo/FeignConfiguration.java rename to pact/pact-feign-consumer/src/main/java/com/example/demo/FeignConfiguration.java diff --git a/junit5/src/main/resources/application.yml b/pact/pact-feign-consumer/src/main/resources/application.yml similarity index 100% rename from junit5/src/main/resources/application.yml rename to pact/pact-feign-consumer/src/main/resources/application.yml diff --git a/pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java b/pact/pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java similarity index 100% rename from pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java rename to pact/pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java diff --git a/pact-feign-consumer/src/test/java/com/example/demo/DemoApplicationTests.java b/pact/pact-feign-consumer/src/test/java/com/example/demo/DemoApplicationTests.java similarity index 100% rename from pact-feign-consumer/src/test/java/com/example/demo/DemoApplicationTests.java rename to pact/pact-feign-consumer/src/test/java/com/example/demo/DemoApplicationTests.java diff --git a/pact-feign-consumer/.gitignore b/pact/pact-spring-data-rest-provider/.gitignore similarity index 100% rename from pact-feign-consumer/.gitignore rename to pact/pact-spring-data-rest-provider/.gitignore diff --git a/pact-spring-data-rest-provider/README.md b/pact/pact-spring-data-rest-provider/README.md similarity index 100% rename from pact-spring-data-rest-provider/README.md rename to pact/pact-spring-data-rest-provider/README.md diff --git a/pact-spring-data-rest-provider/build.gradle b/pact/pact-spring-data-rest-provider/build.gradle similarity index 100% rename from pact-spring-data-rest-provider/build.gradle rename to pact/pact-spring-data-rest-provider/build.gradle diff --git a/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.jar b/pact/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.jar rename to pact/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.jar diff --git a/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.properties b/pact/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.properties rename to pact/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.properties diff --git a/pact-feign-consumer/gradlew b/pact/pact-spring-data-rest-provider/gradlew similarity index 100% rename from pact-feign-consumer/gradlew rename to pact/pact-spring-data-rest-provider/gradlew diff --git a/pact-feign-consumer/gradlew.bat b/pact/pact-spring-data-rest-provider/gradlew.bat similarity index 100% rename from pact-feign-consumer/gradlew.bat rename to pact/pact-spring-data-rest-provider/gradlew.bat diff --git a/pact-spring-data-rest-provider/src/main/java/com/example/demo/Address.java b/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/Address.java similarity index 100% rename from pact-spring-data-rest-provider/src/main/java/com/example/demo/Address.java rename to pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/Address.java diff --git a/pact-spring-data-rest-provider/src/main/java/com/example/demo/AddressRepository.java b/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/AddressRepository.java similarity index 100% rename from pact-spring-data-rest-provider/src/main/java/com/example/demo/AddressRepository.java rename to pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/AddressRepository.java diff --git a/pact-spring-data-rest-provider/src/main/java/com/example/demo/Customer.java b/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/Customer.java similarity index 100% rename from pact-spring-data-rest-provider/src/main/java/com/example/demo/Customer.java rename to pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/Customer.java diff --git a/pact-spring-data-rest-provider/src/main/java/com/example/demo/CustomerRepository.java b/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/CustomerRepository.java similarity index 100% rename from pact-spring-data-rest-provider/src/main/java/com/example/demo/CustomerRepository.java rename to pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/CustomerRepository.java diff --git a/pact-spring-data-rest-provider/src/main/java/com/example/demo/DemoApplication.java b/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from pact-spring-data-rest-provider/src/main/java/com/example/demo/DemoApplication.java rename to pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/DemoApplication.java diff --git a/pact-spring-data-rest-provider/src/main/resources/application.properties b/pact/pact-spring-data-rest-provider/src/main/resources/application.properties similarity index 100% rename from pact-spring-data-rest-provider/src/main/resources/application.properties rename to pact/pact-spring-data-rest-provider/src/main/resources/application.properties diff --git a/pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java b/pact/pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java similarity index 100% rename from pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java rename to pact/pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java diff --git a/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseState.java b/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseState.java similarity index 100% rename from pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseState.java rename to pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseState.java diff --git a/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStateHolder.java b/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStateHolder.java similarity index 100% rename from pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStateHolder.java rename to pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStateHolder.java diff --git a/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStatesInitializer.java b/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStatesInitializer.java similarity index 100% rename from pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStatesInitializer.java rename to pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStatesInitializer.java diff --git a/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactDatabaseStatesAutoConfiguration.java b/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactDatabaseStatesAutoConfiguration.java similarity index 100% rename from pact-spring-data-rest-provider/src/test/java/com/example/framework/PactDatabaseStatesAutoConfiguration.java rename to pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactDatabaseStatesAutoConfiguration.java diff --git a/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactProperties.java b/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactProperties.java similarity index 100% rename from pact-spring-data-rest-provider/src/test/java/com/example/framework/PactProperties.java rename to pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactProperties.java diff --git a/pact-spring-data-rest-provider/src/test/java/com/example/framework/SpringBootStarter.java b/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/SpringBootStarter.java similarity index 100% rename from pact-spring-data-rest-provider/src/test/java/com/example/framework/SpringBootStarter.java rename to pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/SpringBootStarter.java diff --git a/pact-spring-data-rest-provider/src/test/resources/META-INF/spring.factories b/pact/pact-spring-data-rest-provider/src/test/resources/META-INF/spring.factories similarity index 100% rename from pact-spring-data-rest-provider/src/test/resources/META-INF/spring.factories rename to pact/pact-spring-data-rest-provider/src/test/resources/META-INF/spring.factories diff --git a/pact-spring-data-rest-provider/src/test/resources/address-collection.sql b/pact/pact-spring-data-rest-provider/src/test/resources/address-collection.sql similarity index 100% rename from pact-spring-data-rest-provider/src/test/resources/address-collection.sql rename to pact/pact-spring-data-rest-provider/src/test/resources/address-collection.sql diff --git a/pact-spring-data-rest-provider/src/test/resources/application-pact.properties b/pact/pact-spring-data-rest-provider/src/test/resources/application-pact.properties similarity index 100% rename from pact-spring-data-rest-provider/src/test/resources/application-pact.properties rename to pact/pact-spring-data-rest-provider/src/test/resources/application-pact.properties diff --git a/pact-spring-data-rest-provider/src/test/resources/initial-schema.sql b/pact/pact-spring-data-rest-provider/src/test/resources/initial-schema.sql similarity index 100% rename from pact-spring-data-rest-provider/src/test/resources/initial-schema.sql rename to pact/pact-spring-data-rest-provider/src/test/resources/initial-schema.sql diff --git a/pact-spring-data-rest-provider/src/test/resources/single-address.sql b/pact/pact-spring-data-rest-provider/src/test/resources/single-address.sql similarity index 100% rename from pact-spring-data-rest-provider/src/test/resources/single-address.sql rename to pact/pact-spring-data-rest-provider/src/test/resources/single-address.sql diff --git a/pact-spring-data-rest-provider/.gitignore b/pact/pact-spring-provider/.gitignore similarity index 100% rename from pact-spring-data-rest-provider/.gitignore rename to pact/pact-spring-provider/.gitignore diff --git a/pact-spring-provider/README.md b/pact/pact-spring-provider/README.md similarity index 100% rename from pact-spring-provider/README.md rename to pact/pact-spring-provider/README.md diff --git a/pact-spring-provider/build.gradle b/pact/pact-spring-provider/build.gradle similarity index 100% rename from pact-spring-provider/build.gradle rename to pact/pact-spring-provider/build.gradle diff --git a/pact-spring-provider/gradle/wrapper/gradle-wrapper.jar b/pact/pact-spring-provider/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from pact-spring-provider/gradle/wrapper/gradle-wrapper.jar rename to pact/pact-spring-provider/gradle/wrapper/gradle-wrapper.jar diff --git a/pact-spring-provider/gradle/wrapper/gradle-wrapper.properties b/pact/pact-spring-provider/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from pact-spring-provider/gradle/wrapper/gradle-wrapper.properties rename to pact/pact-spring-provider/gradle/wrapper/gradle-wrapper.properties diff --git a/pact-spring-data-rest-provider/gradlew b/pact/pact-spring-provider/gradlew similarity index 100% rename from pact-spring-data-rest-provider/gradlew rename to pact/pact-spring-provider/gradlew diff --git a/pact-spring-data-rest-provider/gradlew.bat b/pact/pact-spring-provider/gradlew.bat similarity index 100% rename from pact-spring-data-rest-provider/gradlew.bat rename to pact/pact-spring-provider/gradlew.bat diff --git a/pact-spring-provider/src/main/java/com/example/demo/DemoApplication.java b/pact/pact-spring-provider/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from pact-spring-provider/src/main/java/com/example/demo/DemoApplication.java rename to pact/pact-spring-provider/src/main/java/com/example/demo/DemoApplication.java diff --git a/pact-spring-provider/src/main/java/com/example/demo/IdObject.java b/pact/pact-spring-provider/src/main/java/com/example/demo/IdObject.java similarity index 100% rename from pact-spring-provider/src/main/java/com/example/demo/IdObject.java rename to pact/pact-spring-provider/src/main/java/com/example/demo/IdObject.java diff --git a/pact-spring-provider/src/main/java/com/example/demo/User.java b/pact/pact-spring-provider/src/main/java/com/example/demo/User.java similarity index 100% rename from pact-spring-provider/src/main/java/com/example/demo/User.java rename to pact/pact-spring-provider/src/main/java/com/example/demo/User.java diff --git a/pact-spring-provider/src/main/java/com/example/demo/UserController.java b/pact/pact-spring-provider/src/main/java/com/example/demo/UserController.java similarity index 100% rename from pact-spring-provider/src/main/java/com/example/demo/UserController.java rename to pact/pact-spring-provider/src/main/java/com/example/demo/UserController.java diff --git a/pact-spring-provider/src/main/java/com/example/demo/UserRepository.java b/pact/pact-spring-provider/src/main/java/com/example/demo/UserRepository.java similarity index 100% rename from pact-spring-provider/src/main/java/com/example/demo/UserRepository.java rename to pact/pact-spring-provider/src/main/java/com/example/demo/UserRepository.java diff --git a/pact-spring-provider/src/main/resources/application.properties b/pact/pact-spring-provider/src/main/resources/application.properties similarity index 100% rename from pact-spring-provider/src/main/resources/application.properties rename to pact/pact-spring-provider/src/main/resources/application.properties diff --git a/pact-spring-provider/src/test/java/com/example/demo/UserControllerProviderTest.java b/pact/pact-spring-provider/src/test/java/com/example/demo/UserControllerProviderTest.java similarity index 100% rename from pact-spring-provider/src/test/java/com/example/demo/UserControllerProviderTest.java rename to pact/pact-spring-provider/src/test/java/com/example/demo/UserControllerProviderTest.java diff --git a/settings.gradle b/settings.gradle index 17e069a..476af7e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,20 +1,19 @@ -include 'spring-data-rest-associations' -include 'feign-with-spring-data-rest' -include 'spring-data-rest-springfox' +include 'spring-data:spring-data-rest-associations' +include 'spring-data:spring-data-rest-springfox' -// pact-feign-consumer must run before pact-spring-data-rest-provider because it creates a shared pact file -include 'pact-feign-consumer' -include 'pact-spring-data-rest-provider' -include 'pact-spring-provider' -include 'spring-cloud-contract-provider' +include 'spring-cloud:feign-with-spring-data-rest' +include 'spring-cloud:spring-cloud-contract-provider' -include 'sleuth-downstream-service' -include 'sleuth-upstream-service' +include 'pact:pact-feign-consumer' // must run before pact-spring-data-rest-provider +include 'pact:pact-spring-data-rest-provider' +include 'pact:pact-spring-provider' -include 'rabbitmq-event-brokering' +include 'spring-cloud:sleuth-downstream-service' +include 'spring-cloud:sleuth-upstream-service' -include 'junit5' +include 'spring-boot:rabbitmq-event-brokering' + +include 'junit:conditions' -include 'spring-boot-tests' diff --git a/rabbitmq-event-brokering/.gitignore b/spring-boot/rabbitmq-event-brokering/.gitignore similarity index 100% rename from rabbitmq-event-brokering/.gitignore rename to spring-boot/rabbitmq-event-brokering/.gitignore diff --git a/rabbitmq-event-brokering/README.md b/spring-boot/rabbitmq-event-brokering/README.md similarity index 100% rename from rabbitmq-event-brokering/README.md rename to spring-boot/rabbitmq-event-brokering/README.md diff --git a/rabbitmq-event-brokering/build.gradle b/spring-boot/rabbitmq-event-brokering/build.gradle similarity index 100% rename from rabbitmq-event-brokering/build.gradle rename to spring-boot/rabbitmq-event-brokering/build.gradle diff --git a/rabbitmq-event-brokering/eventing_amqp.png b/spring-boot/rabbitmq-event-brokering/eventing_amqp.png similarity index 100% rename from rabbitmq-event-brokering/eventing_amqp.png rename to spring-boot/rabbitmq-event-brokering/eventing_amqp.png diff --git a/rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.jar b/spring-boot/rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.jar rename to spring-boot/rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.jar diff --git a/rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.properties b/spring-boot/rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.properties rename to spring-boot/rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.properties diff --git a/pact-spring-provider/gradlew b/spring-boot/rabbitmq-event-brokering/gradlew similarity index 100% rename from pact-spring-provider/gradlew rename to spring-boot/rabbitmq-event-brokering/gradlew diff --git a/pact-spring-provider/gradlew.bat b/spring-boot/rabbitmq-event-brokering/gradlew.bat similarity index 100% rename from pact-spring-provider/gradlew.bat rename to spring-boot/rabbitmq-event-brokering/gradlew.bat diff --git a/rabbitmq-event-brokering/src/main/java/com/example/demo/EventPublisher.java b/spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventPublisher.java similarity index 100% rename from rabbitmq-event-brokering/src/main/java/com/example/demo/EventPublisher.java rename to spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventPublisher.java diff --git a/rabbitmq-event-brokering/src/main/java/com/example/demo/EventPublisherConfiguration.java b/spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventPublisherConfiguration.java similarity index 100% rename from rabbitmq-event-brokering/src/main/java/com/example/demo/EventPublisherConfiguration.java rename to spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventPublisherConfiguration.java diff --git a/rabbitmq-event-brokering/src/main/java/com/example/demo/EventSubscriber.java b/spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventSubscriber.java similarity index 100% rename from rabbitmq-event-brokering/src/main/java/com/example/demo/EventSubscriber.java rename to spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventSubscriber.java diff --git a/rabbitmq-event-brokering/src/main/java/com/example/demo/EventSubscriberConfiguration.java b/spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventSubscriberConfiguration.java similarity index 100% rename from rabbitmq-event-brokering/src/main/java/com/example/demo/EventSubscriberConfiguration.java rename to spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventSubscriberConfiguration.java diff --git a/rabbitmq-event-brokering/src/main/java/com/example/demo/EventingApplication.java b/spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventingApplication.java similarity index 100% rename from rabbitmq-event-brokering/src/main/java/com/example/demo/EventingApplication.java rename to spring-boot/rabbitmq-event-brokering/src/main/java/com/example/demo/EventingApplication.java diff --git a/rabbitmq-event-brokering/src/main/resources/application.properties b/spring-boot/rabbitmq-event-brokering/src/main/resources/application.properties similarity index 100% rename from rabbitmq-event-brokering/src/main/resources/application.properties rename to spring-boot/rabbitmq-event-brokering/src/main/resources/application.properties diff --git a/rabbitmq-event-brokering/src/test/java/com/example/demo/DemoApplicationTests.java b/spring-boot/rabbitmq-event-brokering/src/test/java/com/example/demo/DemoApplicationTests.java similarity index 100% rename from rabbitmq-event-brokering/src/test/java/com/example/demo/DemoApplicationTests.java rename to spring-boot/rabbitmq-event-brokering/src/test/java/com/example/demo/DemoApplicationTests.java diff --git a/pact-spring-provider/.gitignore b/spring-cloud/feign-with-spring-data-rest/.gitignore similarity index 100% rename from pact-spring-provider/.gitignore rename to spring-cloud/feign-with-spring-data-rest/.gitignore diff --git a/feign-with-spring-data-rest/README.md b/spring-cloud/feign-with-spring-data-rest/README.md similarity index 100% rename from feign-with-spring-data-rest/README.md rename to spring-cloud/feign-with-spring-data-rest/README.md diff --git a/feign-with-spring-data-rest/build.gradle b/spring-cloud/feign-with-spring-data-rest/build.gradle similarity index 100% rename from feign-with-spring-data-rest/build.gradle rename to spring-cloud/feign-with-spring-data-rest/build.gradle diff --git a/rabbitmq-event-brokering/gradlew b/spring-cloud/feign-with-spring-data-rest/gradlew similarity index 100% rename from rabbitmq-event-brokering/gradlew rename to spring-cloud/feign-with-spring-data-rest/gradlew diff --git a/rabbitmq-event-brokering/gradlew.bat b/spring-cloud/feign-with-spring-data-rest/gradlew.bat similarity index 100% rename from rabbitmq-event-brokering/gradlew.bat rename to spring-cloud/feign-with-spring-data-rest/gradlew.bat diff --git a/pact-feign-consumer/src/main/java/com/example/demo/Address.java b/spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/Address.java similarity index 100% rename from pact-feign-consumer/src/main/java/com/example/demo/Address.java rename to spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/Address.java diff --git a/feign-with-spring-data-rest/src/main/java/com/example/demo/AddressClient.java b/spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/AddressClient.java similarity index 100% rename from feign-with-spring-data-rest/src/main/java/com/example/demo/AddressClient.java rename to spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/AddressClient.java diff --git a/pact-feign-consumer/src/main/java/com/example/demo/Customer.java b/spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/Customer.java similarity index 100% rename from pact-feign-consumer/src/main/java/com/example/demo/Customer.java rename to spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/Customer.java diff --git a/pact-feign-consumer/src/main/java/com/example/demo/CustomerClient.java b/spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/CustomerClient.java similarity index 100% rename from pact-feign-consumer/src/main/java/com/example/demo/CustomerClient.java rename to spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/CustomerClient.java diff --git a/feign-with-spring-data-rest/src/main/java/com/example/demo/DemoApplication.java b/spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from feign-with-spring-data-rest/src/main/java/com/example/demo/DemoApplication.java rename to spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/DemoApplication.java diff --git a/pact-feign-consumer/src/main/java/com/example/demo/FeignConfiguration.java b/spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/FeignConfiguration.java similarity index 100% rename from pact-feign-consumer/src/main/java/com/example/demo/FeignConfiguration.java rename to spring-cloud/feign-with-spring-data-rest/src/main/java/com/example/demo/FeignConfiguration.java diff --git a/pact-feign-consumer/src/main/resources/application.yml b/spring-cloud/feign-with-spring-data-rest/src/main/resources/application.yml similarity index 100% rename from pact-feign-consumer/src/main/resources/application.yml rename to spring-cloud/feign-with-spring-data-rest/src/main/resources/application.yml diff --git a/sleuth-downstream-service/.gitignore b/spring-cloud/sleuth-downstream-service/.gitignore similarity index 100% rename from sleuth-downstream-service/.gitignore rename to spring-cloud/sleuth-downstream-service/.gitignore diff --git a/sleuth-downstream-service/README.md b/spring-cloud/sleuth-downstream-service/README.md similarity index 100% rename from sleuth-downstream-service/README.md rename to spring-cloud/sleuth-downstream-service/README.md diff --git a/sleuth-downstream-service/build.gradle b/spring-cloud/sleuth-downstream-service/build.gradle similarity index 100% rename from sleuth-downstream-service/build.gradle rename to spring-cloud/sleuth-downstream-service/build.gradle diff --git a/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.jar b/spring-cloud/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from sleuth-downstream-service/gradle/wrapper/gradle-wrapper.jar rename to spring-cloud/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.jar diff --git a/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.properties b/spring-cloud/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from sleuth-downstream-service/gradle/wrapper/gradle-wrapper.properties rename to spring-cloud/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.properties diff --git a/sleuth-downstream-service/gradlew b/spring-cloud/sleuth-downstream-service/gradlew similarity index 100% rename from sleuth-downstream-service/gradlew rename to spring-cloud/sleuth-downstream-service/gradlew diff --git a/sleuth-downstream-service/gradlew.bat b/spring-cloud/sleuth-downstream-service/gradlew.bat similarity index 100% rename from sleuth-downstream-service/gradlew.bat rename to spring-cloud/sleuth-downstream-service/gradlew.bat diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/Address.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/Address.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/Address.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/Address.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/AddressClient.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/AddressClient.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/AddressClient.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/AddressClient.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/Controller.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/Controller.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/Controller.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/Controller.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/Customer.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/Customer.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/Customer.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/Customer.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/CustomerAndAddress.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/CustomerAndAddress.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/CustomerAndAddress.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/CustomerAndAddress.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/CustomerClient.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/CustomerClient.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/CustomerClient.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/CustomerClient.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/DemoApplication.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/DemoApplication.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/DemoApplication.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/ErrorHandler.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/ErrorHandler.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/ErrorHandler.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/ErrorHandler.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/FeignConfiguration.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/FeignConfiguration.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/FeignConfiguration.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/FeignConfiguration.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/RequestLoggingFilterConfig.java b/spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/RequestLoggingFilterConfig.java similarity index 100% rename from sleuth-downstream-service/src/main/java/com/example/demo/RequestLoggingFilterConfig.java rename to spring-cloud/sleuth-downstream-service/src/main/java/com/example/demo/RequestLoggingFilterConfig.java diff --git a/sleuth-downstream-service/src/main/resources/application.yml b/spring-cloud/sleuth-downstream-service/src/main/resources/application.yml similarity index 100% rename from sleuth-downstream-service/src/main/resources/application.yml rename to spring-cloud/sleuth-downstream-service/src/main/resources/application.yml diff --git a/sleuth-downstream-service/src/main/resources/bootstrap.properties b/spring-cloud/sleuth-downstream-service/src/main/resources/bootstrap.properties similarity index 100% rename from sleuth-downstream-service/src/main/resources/bootstrap.properties rename to spring-cloud/sleuth-downstream-service/src/main/resources/bootstrap.properties diff --git a/sleuth-downstream-service/src/main/resources/logback-spring.xml b/spring-cloud/sleuth-downstream-service/src/main/resources/logback-spring.xml similarity index 100% rename from sleuth-downstream-service/src/main/resources/logback-spring.xml rename to spring-cloud/sleuth-downstream-service/src/main/resources/logback-spring.xml diff --git a/sleuth-upstream-service/.gitignore b/spring-cloud/sleuth-upstream-service/.gitignore similarity index 100% rename from sleuth-upstream-service/.gitignore rename to spring-cloud/sleuth-upstream-service/.gitignore diff --git a/sleuth-upstream-service/README.md b/spring-cloud/sleuth-upstream-service/README.md similarity index 100% rename from sleuth-upstream-service/README.md rename to spring-cloud/sleuth-upstream-service/README.md diff --git a/sleuth-upstream-service/build.gradle b/spring-cloud/sleuth-upstream-service/build.gradle similarity index 100% rename from sleuth-upstream-service/build.gradle rename to spring-cloud/sleuth-upstream-service/build.gradle diff --git a/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.jar b/spring-cloud/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from sleuth-upstream-service/gradle/wrapper/gradle-wrapper.jar rename to spring-cloud/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.jar diff --git a/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.properties b/spring-cloud/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from sleuth-upstream-service/gradle/wrapper/gradle-wrapper.properties rename to spring-cloud/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.properties diff --git a/sleuth-upstream-service/gradlew b/spring-cloud/sleuth-upstream-service/gradlew similarity index 100% rename from sleuth-upstream-service/gradlew rename to spring-cloud/sleuth-upstream-service/gradlew diff --git a/sleuth-upstream-service/gradlew.bat b/spring-cloud/sleuth-upstream-service/gradlew.bat similarity index 100% rename from sleuth-upstream-service/gradlew.bat rename to spring-cloud/sleuth-upstream-service/gradlew.bat diff --git a/sleuth-upstream-service/src/main/java/com/example/demo/Address.java b/spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/Address.java similarity index 100% rename from sleuth-upstream-service/src/main/java/com/example/demo/Address.java rename to spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/Address.java diff --git a/sleuth-upstream-service/src/main/java/com/example/demo/Controller.java b/spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/Controller.java similarity index 100% rename from sleuth-upstream-service/src/main/java/com/example/demo/Controller.java rename to spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/Controller.java diff --git a/sleuth-upstream-service/src/main/java/com/example/demo/Customer.java b/spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/Customer.java similarity index 100% rename from sleuth-upstream-service/src/main/java/com/example/demo/Customer.java rename to spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/Customer.java diff --git a/sleuth-upstream-service/src/main/java/com/example/demo/DemoApplication.java b/spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from sleuth-upstream-service/src/main/java/com/example/demo/DemoApplication.java rename to spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/DemoApplication.java diff --git a/sleuth-upstream-service/src/main/java/com/example/demo/ErrorHandler.java b/spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/ErrorHandler.java similarity index 100% rename from sleuth-upstream-service/src/main/java/com/example/demo/ErrorHandler.java rename to spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/ErrorHandler.java diff --git a/sleuth-upstream-service/src/main/java/com/example/demo/RequestLoggingFilterConfig.java b/spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/RequestLoggingFilterConfig.java similarity index 100% rename from sleuth-upstream-service/src/main/java/com/example/demo/RequestLoggingFilterConfig.java rename to spring-cloud/sleuth-upstream-service/src/main/java/com/example/demo/RequestLoggingFilterConfig.java diff --git a/sleuth-upstream-service/src/main/resources/application.yml b/spring-cloud/sleuth-upstream-service/src/main/resources/application.yml similarity index 100% rename from sleuth-upstream-service/src/main/resources/application.yml rename to spring-cloud/sleuth-upstream-service/src/main/resources/application.yml diff --git a/sleuth-upstream-service/src/main/resources/bootstrap.properties b/spring-cloud/sleuth-upstream-service/src/main/resources/bootstrap.properties similarity index 100% rename from sleuth-upstream-service/src/main/resources/bootstrap.properties rename to spring-cloud/sleuth-upstream-service/src/main/resources/bootstrap.properties diff --git a/sleuth-upstream-service/src/main/resources/logback-spring.xml b/spring-cloud/sleuth-upstream-service/src/main/resources/logback-spring.xml similarity index 100% rename from sleuth-upstream-service/src/main/resources/logback-spring.xml rename to spring-cloud/sleuth-upstream-service/src/main/resources/logback-spring.xml diff --git a/spring-cloud-contract-provider/build.gradle b/spring-cloud/spring-cloud-contract-provider/build.gradle similarity index 100% rename from spring-cloud-contract-provider/build.gradle rename to spring-cloud/spring-cloud-contract-provider/build.gradle diff --git a/spring-cloud-contract-provider/gradle.properties b/spring-cloud/spring-cloud-contract-provider/gradle.properties similarity index 100% rename from spring-cloud-contract-provider/gradle.properties rename to spring-cloud/spring-cloud-contract-provider/gradle.properties diff --git a/spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.jar b/spring-cloud/spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.jar rename to spring-cloud/spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.properties b/spring-cloud/spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.properties rename to spring-cloud/spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-contract-provider/gradlew b/spring-cloud/spring-cloud-contract-provider/gradlew similarity index 100% rename from spring-cloud-contract-provider/gradlew rename to spring-cloud/spring-cloud-contract-provider/gradlew diff --git a/spring-cloud-contract-provider/gradlew.bat b/spring-cloud/spring-cloud-contract-provider/gradlew.bat similarity index 100% rename from spring-cloud-contract-provider/gradlew.bat rename to spring-cloud/spring-cloud-contract-provider/gradlew.bat diff --git a/spring-cloud-contract-provider/src/main/java/io/reflectoring/DemoApplication.java b/spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/DemoApplication.java similarity index 100% rename from spring-cloud-contract-provider/src/main/java/io/reflectoring/DemoApplication.java rename to spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/DemoApplication.java diff --git a/spring-cloud-contract-provider/src/main/java/io/reflectoring/IdObject.java b/spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/IdObject.java similarity index 100% rename from spring-cloud-contract-provider/src/main/java/io/reflectoring/IdObject.java rename to spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/IdObject.java diff --git a/spring-cloud-contract-provider/src/main/java/io/reflectoring/User.java b/spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/User.java similarity index 100% rename from spring-cloud-contract-provider/src/main/java/io/reflectoring/User.java rename to spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/User.java diff --git a/spring-cloud-contract-provider/src/main/java/io/reflectoring/UserController.java b/spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/UserController.java similarity index 100% rename from spring-cloud-contract-provider/src/main/java/io/reflectoring/UserController.java rename to spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/UserController.java diff --git a/spring-cloud-contract-provider/src/main/java/io/reflectoring/UserRepository.java b/spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/UserRepository.java similarity index 100% rename from spring-cloud-contract-provider/src/main/java/io/reflectoring/UserRepository.java rename to spring-cloud/spring-cloud-contract-provider/src/main/java/io/reflectoring/UserRepository.java diff --git a/spring-cloud-contract-provider/src/test/java/io/reflectoring/UserServiceBase.java b/spring-cloud/spring-cloud-contract-provider/src/test/java/io/reflectoring/UserServiceBase.java similarity index 100% rename from spring-cloud-contract-provider/src/test/java/io/reflectoring/UserServiceBase.java rename to spring-cloud/spring-cloud-contract-provider/src/test/java/io/reflectoring/UserServiceBase.java diff --git a/spring-cloud-contract-provider/src/test/resources/contracts/userservice/shouldSaveUser.groovy b/spring-cloud/spring-cloud-contract-provider/src/test/resources/contracts/userservice/shouldSaveUser.groovy similarity index 100% rename from spring-cloud-contract-provider/src/test/resources/contracts/userservice/shouldSaveUser.groovy rename to spring-cloud/spring-cloud-contract-provider/src/test/resources/contracts/userservice/shouldSaveUser.groovy diff --git a/spring-cloud-contract-provider/src/test/resources/contracts/userservice/shouldUpdateUser.groovy b/spring-cloud/spring-cloud-contract-provider/src/test/resources/contracts/userservice/shouldUpdateUser.groovy similarity index 100% rename from spring-cloud-contract-provider/src/test/resources/contracts/userservice/shouldUpdateUser.groovy rename to spring-cloud/spring-cloud-contract-provider/src/test/resources/contracts/userservice/shouldUpdateUser.groovy diff --git a/spring-data-rest-associations/.gitignore b/spring-data/spring-data-rest-associations/.gitignore similarity index 100% rename from spring-data-rest-associations/.gitignore rename to spring-data/spring-data-rest-associations/.gitignore diff --git a/spring-data-rest-associations/README.md b/spring-data/spring-data-rest-associations/README.md similarity index 100% rename from spring-data-rest-associations/README.md rename to spring-data/spring-data-rest-associations/README.md diff --git a/spring-data-rest-associations/build.gradle b/spring-data/spring-data-rest-associations/build.gradle similarity index 100% rename from spring-data-rest-associations/build.gradle rename to spring-data/spring-data-rest-associations/build.gradle diff --git a/spring-data-rest-associations/gradle/wrapper/gradle-wrapper.jar b/spring-data/spring-data-rest-associations/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-data-rest-associations/gradle/wrapper/gradle-wrapper.jar rename to spring-data/spring-data-rest-associations/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-data-rest-associations/gradle/wrapper/gradle-wrapper.properties b/spring-data/spring-data-rest-associations/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-data-rest-associations/gradle/wrapper/gradle-wrapper.properties rename to spring-data/spring-data-rest-associations/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-data-rest-associations/gradlew b/spring-data/spring-data-rest-associations/gradlew similarity index 100% rename from spring-data-rest-associations/gradlew rename to spring-data/spring-data-rest-associations/gradlew diff --git a/spring-data-rest-associations/gradlew.bat b/spring-data/spring-data-rest-associations/gradlew.bat similarity index 100% rename from spring-data-rest-associations/gradlew.bat rename to spring-data/spring-data-rest-associations/gradlew.bat diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/DemoApplication.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/DemoApplication.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/DemoApplication.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/Initializer.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/Initializer.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/Initializer.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/Initializer.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalAddress.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalAddress.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalAddress.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalAddress.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalAddressRepository.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalAddressRepository.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalAddressRepository.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalAddressRepository.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalCustomer.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalCustomer.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalCustomer.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalCustomer.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalCustomerRepository.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalCustomerRepository.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalCustomerRepository.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/bidirectional/BidirectionalCustomerRepository.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneAddress.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneAddress.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneAddress.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneAddress.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneAddressRepository.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneAddressRepository.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneAddressRepository.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneAddressRepository.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneCustomer.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneCustomer.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneCustomer.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneCustomer.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneCustomerRepository.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneCustomerRepository.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneCustomerRepository.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/manytoone/ManyToOneCustomerRepository.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyAddress.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyAddress.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyAddress.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyAddress.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyAddressRepository.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyAddressRepository.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyAddressRepository.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyAddressRepository.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyCustomer.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyCustomer.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyCustomer.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyCustomer.java diff --git a/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyCustomerRepository.java b/spring-data/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyCustomerRepository.java similarity index 100% rename from spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyCustomerRepository.java rename to spring-data/spring-data-rest-associations/src/main/java/com/example/demo/onetomany/OneToManyCustomerRepository.java diff --git a/spring-data-rest-associations/src/main/resources/application.properties b/spring-data/spring-data-rest-associations/src/main/resources/application.properties similarity index 100% rename from spring-data-rest-associations/src/main/resources/application.properties rename to spring-data/spring-data-rest-associations/src/main/resources/application.properties diff --git a/spring-data-rest-associations/src/test/java/com/example/demo/DemoApplicationTests.java b/spring-data/spring-data-rest-associations/src/test/java/com/example/demo/DemoApplicationTests.java similarity index 100% rename from spring-data-rest-associations/src/test/java/com/example/demo/DemoApplicationTests.java rename to spring-data/spring-data-rest-associations/src/test/java/com/example/demo/DemoApplicationTests.java diff --git a/spring-data-rest-springfox/.gitignore b/spring-data/spring-data-rest-springfox/.gitignore similarity index 100% rename from spring-data-rest-springfox/.gitignore rename to spring-data/spring-data-rest-springfox/.gitignore diff --git a/spring-data-rest-springfox/README.md b/spring-data/spring-data-rest-springfox/README.md similarity index 100% rename from spring-data-rest-springfox/README.md rename to spring-data/spring-data-rest-springfox/README.md diff --git a/spring-data-rest-springfox/build.gradle b/spring-data/spring-data-rest-springfox/build.gradle similarity index 100% rename from spring-data-rest-springfox/build.gradle rename to spring-data/spring-data-rest-springfox/build.gradle diff --git a/spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.jar b/spring-data/spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.jar rename to spring-data/spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.properties b/spring-data/spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.properties rename to spring-data/spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-data-rest-springfox/gradlew b/spring-data/spring-data-rest-springfox/gradlew similarity index 100% rename from spring-data-rest-springfox/gradlew rename to spring-data/spring-data-rest-springfox/gradlew diff --git a/spring-data-rest-springfox/gradlew.bat b/spring-data/spring-data-rest-springfox/gradlew.bat similarity index 100% rename from spring-data-rest-springfox/gradlew.bat rename to spring-data/spring-data-rest-springfox/gradlew.bat diff --git a/spring-data-rest-springfox/src/main/java/com/example/demo/Address.java b/spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/Address.java similarity index 100% rename from spring-data-rest-springfox/src/main/java/com/example/demo/Address.java rename to spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/Address.java diff --git a/spring-data-rest-springfox/src/main/java/com/example/demo/AddressRepository.java b/spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/AddressRepository.java similarity index 100% rename from spring-data-rest-springfox/src/main/java/com/example/demo/AddressRepository.java rename to spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/AddressRepository.java diff --git a/spring-data-rest-springfox/src/main/java/com/example/demo/Customer.java b/spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/Customer.java similarity index 100% rename from spring-data-rest-springfox/src/main/java/com/example/demo/Customer.java rename to spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/Customer.java diff --git a/spring-data-rest-springfox/src/main/java/com/example/demo/CustomerRepository.java b/spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/CustomerRepository.java similarity index 100% rename from spring-data-rest-springfox/src/main/java/com/example/demo/CustomerRepository.java rename to spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/CustomerRepository.java diff --git a/spring-data-rest-springfox/src/main/java/com/example/demo/DemoApplication.java b/spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from spring-data-rest-springfox/src/main/java/com/example/demo/DemoApplication.java rename to spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/DemoApplication.java diff --git a/spring-data-rest-springfox/src/main/java/com/example/demo/Initializer.java b/spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/Initializer.java similarity index 100% rename from spring-data-rest-springfox/src/main/java/com/example/demo/Initializer.java rename to spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/Initializer.java diff --git a/spring-data-rest-springfox/src/main/java/com/example/demo/SpringfoxConfiguration.java b/spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/SpringfoxConfiguration.java similarity index 100% rename from spring-data-rest-springfox/src/main/java/com/example/demo/SpringfoxConfiguration.java rename to spring-data/spring-data-rest-springfox/src/main/java/com/example/demo/SpringfoxConfiguration.java diff --git a/spring-data-rest-springfox/src/main/resources/application.properties b/spring-data/spring-data-rest-springfox/src/main/resources/application.properties similarity index 100% rename from spring-data-rest-springfox/src/main/resources/application.properties rename to spring-data/spring-data-rest-springfox/src/main/resources/application.properties