diff --git a/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin b/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin
rename to src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin
diff --git a/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock b/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock
rename to src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock
diff --git a/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin b/src/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin
rename to src/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin
diff --git a/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock b/src/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock
rename to src/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock
diff --git a/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin b/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin
rename to src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin
diff --git a/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock b/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock
rename to src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock
diff --git a/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin b/src/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin
rename to src/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin
diff --git a/GoGreen/Client/.gradle/5.2.1/gc.properties b/src/GoGreen/Client/.gradle/5.2.1/gc.properties
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/gc.properties
rename to src/GoGreen/Client/.gradle/5.2.1/gc.properties
diff --git a/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin
rename to src/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin
diff --git a/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin
rename to src/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin
diff --git a/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock
rename to src/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock
diff --git a/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin
similarity index 100%
rename from GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin
rename to src/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin
diff --git a/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock
similarity index 100%
rename from GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock
rename to src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties b/src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties
similarity index 100%
rename from GoGreen/Client/.gradle/buildOutputCleanup/cache.properties
rename to src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties
diff --git a/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin b/src/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin
similarity index 100%
rename from GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin
rename to src/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/GoGreen/Client/.gradle/vcs-1/gc.properties b/src/GoGreen/Client/.gradle/vcs-1/gc.properties
similarity index 100%
rename from GoGreen/Client/.gradle/vcs-1/gc.properties
rename to src/GoGreen/Client/.gradle/vcs-1/gc.properties
diff --git a/GoGreen/Client/.idea/compiler.xml b/src/GoGreen/Client/.idea/compiler.xml
similarity index 100%
rename from GoGreen/Client/.idea/compiler.xml
rename to src/GoGreen/Client/.idea/compiler.xml
diff --git a/GoGreen/Client/.idea/encodings.xml b/src/GoGreen/Client/.idea/encodings.xml
similarity index 100%
rename from GoGreen/Client/.idea/encodings.xml
rename to src/GoGreen/Client/.idea/encodings.xml
diff --git a/GoGreen/Client/.idea/gradle.xml b/src/GoGreen/Client/.idea/gradle.xml
similarity index 100%
rename from GoGreen/Client/.idea/gradle.xml
rename to src/GoGreen/Client/.idea/gradle.xml
diff --git a/GoGreen/Client/.idea/misc.xml b/src/GoGreen/Client/.idea/misc.xml
similarity index 100%
rename from GoGreen/Client/.idea/misc.xml
rename to src/GoGreen/Client/.idea/misc.xml
diff --git a/GoGreen/Client/.idea/modules.xml b/src/GoGreen/Client/.idea/modules.xml
similarity index 100%
rename from GoGreen/Client/.idea/modules.xml
rename to src/GoGreen/Client/.idea/modules.xml
diff --git a/GoGreen/Client/.idea/uiDesigner.xml b/src/GoGreen/Client/.idea/uiDesigner.xml
similarity index 100%
rename from GoGreen/Client/.idea/uiDesigner.xml
rename to src/GoGreen/Client/.idea/uiDesigner.xml
diff --git a/GoGreen/Client/.idea/workspace.xml b/src/GoGreen/Client/.idea/workspace.xml
similarity index 100%
rename from GoGreen/Client/.idea/workspace.xml
rename to src/GoGreen/Client/.idea/workspace.xml
diff --git a/GoGreen/Client/build.gradle b/src/GoGreen/Client/build.gradle
similarity index 100%
rename from GoGreen/Client/build.gradle
rename to src/GoGreen/Client/build.gradle
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController$AlertHelper.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController$AlertHelper.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController$AlertHelper.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController$AlertHelper.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.java.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.java.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.java.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.java.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.source.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.source.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.source.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.source.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.java.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.java.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.java.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.java.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.source.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.source.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.source.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.source.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client/Application.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.java.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.java.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client/Application.java.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.java.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client/index.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client/index.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.html
diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client/index.source.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.source.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/gogreen.client/index.source.html
rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.source.html
diff --git a/GoGreen/Client/build/jacocoHtml/index.html b/src/GoGreen/Client/build/jacocoHtml/index.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/index.html
rename to src/GoGreen/Client/build/jacocoHtml/index.html
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchfc.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchfc.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/branchfc.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchfc.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchnc.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchnc.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/branchnc.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchnc.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchpc.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchpc.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/branchpc.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchpc.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/bundle.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/bundle.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/bundle.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/bundle.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/class.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/class.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/class.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/class.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/down.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/down.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/down.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/down.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/greenbar.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/greenbar.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/greenbar.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/greenbar.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/group.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/group.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/group.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/group.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/method.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/method.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/method.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/method.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/package.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/package.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/package.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/package.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.css b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.css
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.css
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.css
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.js b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.js
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.js
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.js
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/redbar.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/redbar.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/redbar.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/redbar.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.css b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.css
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/report.css
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.css
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/report.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/session.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/session.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/session.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/session.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.js b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.js
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.js
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.js
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/source.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/source.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/source.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/source.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/up.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/up.gif
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/up.gif
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/up.gif
diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-sessions.html b/src/GoGreen/Client/build/jacocoHtml/jacoco-sessions.html
similarity index 100%
rename from GoGreen/Client/build/jacocoHtml/jacoco-sessions.html
rename to src/GoGreen/Client/build/jacocoHtml/jacoco-sessions.html
diff --git a/GoGreen/Client/build/resources/main/application.properties b/src/GoGreen/Client/build/resources/main/application.properties
similarity index 100%
rename from GoGreen/Client/build/resources/main/application.properties
rename to src/GoGreen/Client/build/resources/main/application.properties
diff --git a/GoGreen/Client/build/resources/main/fxml/dashboard.fxml b/src/GoGreen/Client/build/resources/main/fxml/dashboard.fxml
similarity index 100%
rename from GoGreen/Client/build/resources/main/fxml/dashboard.fxml
rename to src/GoGreen/Client/build/resources/main/fxml/dashboard.fxml
diff --git a/GoGreen/Client/build/resources/main/fxml/sample.fxml b/src/GoGreen/Client/build/resources/main/fxml/sample.fxml
similarity index 100%
rename from GoGreen/Client/build/resources/main/fxml/sample.fxml
rename to src/GoGreen/Client/build/resources/main/fxml/sample.fxml
diff --git a/GoGreen/Client/build/resources/main/pinkleaf.jpg b/src/GoGreen/Client/build/resources/main/pinkleaf.jpg
similarity index 100%
rename from GoGreen/Client/build/resources/main/pinkleaf.jpg
rename to src/GoGreen/Client/build/resources/main/pinkleaf.jpg
diff --git a/GoGreen/Client/src/main/java/gogreen/client/Application.java b/src/GoGreen/Client/src/main/java/gogreen/client/Application.java
similarity index 100%
rename from GoGreen/Client/src/main/java/gogreen/client/Application.java
rename to src/GoGreen/Client/src/main/java/gogreen/client/Application.java
diff --git a/GoGreen/Client/src/main/java/gogreen/client/controller/UserController.java b/src/GoGreen/Client/src/main/java/gogreen/client/controller/UserController.java
similarity index 100%
rename from GoGreen/Client/src/main/java/gogreen/client/controller/UserController.java
rename to src/GoGreen/Client/src/main/java/gogreen/client/controller/UserController.java
diff --git a/GoGreen/Client/src/main/java/gogreen/client/rest/UserService.java b/src/GoGreen/Client/src/main/java/gogreen/client/rest/UserService.java
similarity index 100%
rename from GoGreen/Client/src/main/java/gogreen/client/rest/UserService.java
rename to src/GoGreen/Client/src/main/java/gogreen/client/rest/UserService.java
diff --git a/GoGreen/Client/src/main/resources/application.properties b/src/GoGreen/Client/src/main/resources/application.properties
similarity index 100%
rename from GoGreen/Client/src/main/resources/application.properties
rename to src/GoGreen/Client/src/main/resources/application.properties
diff --git a/GoGreen/Client/src/main/resources/fxml/dashboard.fxml b/src/GoGreen/Client/src/main/resources/fxml/dashboard.fxml
similarity index 100%
rename from GoGreen/Client/src/main/resources/fxml/dashboard.fxml
rename to src/GoGreen/Client/src/main/resources/fxml/dashboard.fxml
diff --git a/GoGreen/Client/src/main/resources/fxml/sample.fxml b/src/GoGreen/Client/src/main/resources/fxml/sample.fxml
similarity index 100%
rename from GoGreen/Client/src/main/resources/fxml/sample.fxml
rename to src/GoGreen/Client/src/main/resources/fxml/sample.fxml
diff --git a/GoGreen/Client/src/main/resources/pinkleaf.jpg b/src/GoGreen/Client/src/main/resources/pinkleaf.jpg
similarity index 100%
rename from GoGreen/Client/src/main/resources/pinkleaf.jpg
rename to src/GoGreen/Client/src/main/resources/pinkleaf.jpg
diff --git a/GoGreen/Client/src/test/java/UserServiceTest.java b/src/GoGreen/Client/src/test/java/UserServiceTest.java
similarity index 100%
rename from GoGreen/Client/src/test/java/UserServiceTest.java
rename to src/GoGreen/Client/src/test/java/UserServiceTest.java
diff --git a/GoGreen/Common/build.gradle b/src/GoGreen/Common/build.gradle
similarity index 100%
rename from GoGreen/Common/build.gradle
rename to src/GoGreen/Common/build.gradle
diff --git a/GoGreen/Common/src/main/java/gogreen/common/ApplicationException.java b/src/GoGreen/Common/src/main/java/gogreen/common/ApplicationException.java
similarity index 100%
rename from GoGreen/Common/src/main/java/gogreen/common/ApplicationException.java
rename to src/GoGreen/Common/src/main/java/gogreen/common/ApplicationException.java
diff --git a/GoGreen/Common/src/main/java/gogreen/common/ErrorResponse.java b/src/GoGreen/Common/src/main/java/gogreen/common/ErrorResponse.java
similarity index 100%
rename from GoGreen/Common/src/main/java/gogreen/common/ErrorResponse.java
rename to src/GoGreen/Common/src/main/java/gogreen/common/ErrorResponse.java
diff --git a/GoGreen/Common/src/main/java/gogreen/common/UserDTO.java b/src/GoGreen/Common/src/main/java/gogreen/common/UserDTO.java
similarity index 100%
rename from GoGreen/Common/src/main/java/gogreen/common/UserDTO.java
rename to src/GoGreen/Common/src/main/java/gogreen/common/UserDTO.java
diff --git a/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin b/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin
rename to src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin
diff --git a/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock b/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock
rename to src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock
diff --git a/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin b/src/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin
rename to src/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin
diff --git a/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock b/src/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock
rename to src/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock
diff --git a/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin b/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin
rename to src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin
diff --git a/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock b/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock
rename to src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock
diff --git a/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin b/src/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin
rename to src/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin
diff --git a/GoGreen/Server/.gradle/5.2.1/gc.properties b/src/GoGreen/Server/.gradle/5.2.1/gc.properties
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/gc.properties
rename to src/GoGreen/Server/.gradle/5.2.1/gc.properties
diff --git a/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin
rename to src/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin
diff --git a/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin
rename to src/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin
diff --git a/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock
rename to src/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock
diff --git a/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin
similarity index 100%
rename from GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin
rename to src/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin
diff --git a/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock
similarity index 100%
rename from GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock
rename to src/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties b/src/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties
similarity index 100%
rename from GoGreen/Server/.gradle/buildOutputCleanup/cache.properties
rename to src/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties
diff --git a/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin b/src/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin
similarity index 100%
rename from GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin
rename to src/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/GoGreen/Server/.gradle/vcs-1/gc.properties b/src/GoGreen/Server/.gradle/vcs-1/gc.properties
similarity index 100%
rename from GoGreen/Server/.gradle/vcs-1/gc.properties
rename to src/GoGreen/Server/.gradle/vcs-1/gc.properties
diff --git a/GoGreen/Server/.idea/encodings.xml b/src/GoGreen/Server/.idea/encodings.xml
similarity index 100%
rename from GoGreen/Server/.idea/encodings.xml
rename to src/GoGreen/Server/.idea/encodings.xml
diff --git a/GoGreen/Server/.idea/gradle.xml b/src/GoGreen/Server/.idea/gradle.xml
similarity index 100%
rename from GoGreen/Server/.idea/gradle.xml
rename to src/GoGreen/Server/.idea/gradle.xml
diff --git a/GoGreen/Server/.idea/misc.xml b/src/GoGreen/Server/.idea/misc.xml
similarity index 100%
rename from GoGreen/Server/.idea/misc.xml
rename to src/GoGreen/Server/.idea/misc.xml
diff --git a/GoGreen/Server/.idea/workspace.xml b/src/GoGreen/Server/.idea/workspace.xml
similarity index 100%
rename from GoGreen/Server/.idea/workspace.xml
rename to src/GoGreen/Server/.idea/workspace.xml
diff --git a/GoGreen/Server/build.gradle b/src/GoGreen/Server/build.gradle
similarity index 100%
rename from GoGreen/Server/build.gradle
rename to src/GoGreen/Server/build.gradle
diff --git a/GoGreen/Server/build/jacoco/test.exec b/src/GoGreen/Server/build/jacoco/test.exec
similarity index 100%
rename from GoGreen/Server/build/jacoco/test.exec
rename to src/GoGreen/Server/build/jacoco/test.exec
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.source.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.source.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.source.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.source.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.source.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.source.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.source.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.source.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server/Application.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.java.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server/Application.java.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.java.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server/index.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server/index.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.html
diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server/index.source.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.source.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/gogreen.server/index.source.html
rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.source.html
diff --git a/GoGreen/Server/build/jacocoHtml/index.html b/src/GoGreen/Server/build/jacocoHtml/index.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/index.html
rename to src/GoGreen/Server/build/jacocoHtml/index.html
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchfc.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchfc.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/branchfc.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchfc.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchnc.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchnc.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/branchnc.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchnc.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchpc.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchpc.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/branchpc.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchpc.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/bundle.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/bundle.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/bundle.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/bundle.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/class.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/class.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/class.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/class.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/down.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/down.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/down.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/down.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/greenbar.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/greenbar.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/greenbar.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/greenbar.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/group.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/group.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/group.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/group.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/method.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/method.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/method.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/method.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/package.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/package.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/package.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/package.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.css b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.css
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.css
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.css
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.js b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.js
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.js
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.js
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/redbar.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/redbar.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/redbar.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/redbar.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.css b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.css
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/report.css
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.css
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/report.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/session.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/session.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/session.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/session.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.js b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.js
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.js
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.js
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/source.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/source.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/source.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/source.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/up.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/up.gif
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/up.gif
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/up.gif
diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-sessions.html b/src/GoGreen/Server/build/jacocoHtml/jacoco-sessions.html
similarity index 100%
rename from GoGreen/Server/build/jacocoHtml/jacoco-sessions.html
rename to src/GoGreen/Server/build/jacocoHtml/jacoco-sessions.html
diff --git a/GoGreen/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html b/src/GoGreen/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html
similarity index 100%
rename from GoGreen/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html
rename to src/GoGreen/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html
diff --git a/GoGreen/Server/build/reports/tests/test/css/base-style.css b/src/GoGreen/Server/build/reports/tests/test/css/base-style.css
similarity index 100%
rename from GoGreen/Server/build/reports/tests/test/css/base-style.css
rename to src/GoGreen/Server/build/reports/tests/test/css/base-style.css
diff --git a/GoGreen/Server/build/reports/tests/test/css/style.css b/src/GoGreen/Server/build/reports/tests/test/css/style.css
similarity index 100%
rename from GoGreen/Server/build/reports/tests/test/css/style.css
rename to src/GoGreen/Server/build/reports/tests/test/css/style.css
diff --git a/GoGreen/Server/build/reports/tests/test/index.html b/src/GoGreen/Server/build/reports/tests/test/index.html
similarity index 100%
rename from GoGreen/Server/build/reports/tests/test/index.html
rename to src/GoGreen/Server/build/reports/tests/test/index.html
diff --git a/GoGreen/Server/build/reports/tests/test/js/report.js b/src/GoGreen/Server/build/reports/tests/test/js/report.js
similarity index 100%
rename from GoGreen/Server/build/reports/tests/test/js/report.js
rename to src/GoGreen/Server/build/reports/tests/test/js/report.js
diff --git a/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html b/src/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html
similarity index 100%
rename from GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html
rename to src/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html
diff --git a/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml b/src/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml
similarity index 100%
rename from GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml
rename to src/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml
diff --git a/GoGreen/Server/build/test-results/test/binary/output.bin b/src/GoGreen/Server/build/test-results/test/binary/output.bin
similarity index 100%
rename from GoGreen/Server/build/test-results/test/binary/output.bin
rename to src/GoGreen/Server/build/test-results/test/binary/output.bin
diff --git a/GoGreen/Server/build/test-results/test/binary/output.bin.idx b/src/GoGreen/Server/build/test-results/test/binary/output.bin.idx
similarity index 100%
rename from GoGreen/Server/build/test-results/test/binary/output.bin.idx
rename to src/GoGreen/Server/build/test-results/test/binary/output.bin.idx
diff --git a/GoGreen/Server/build/test-results/test/binary/results.bin b/src/GoGreen/Server/build/test-results/test/binary/results.bin
similarity index 100%
rename from GoGreen/Server/build/test-results/test/binary/results.bin
rename to src/GoGreen/Server/build/test-results/test/binary/results.bin
diff --git a/GoGreen/Server/src/main/java/gogreen/server/Application.java b/src/GoGreen/Server/src/main/java/gogreen/server/Application.java
similarity index 100%
rename from GoGreen/Server/src/main/java/gogreen/server/Application.java
rename to src/GoGreen/Server/src/main/java/gogreen/server/Application.java
diff --git a/GoGreen/Server/src/main/java/gogreen/server/data/model/User.java b/src/GoGreen/Server/src/main/java/gogreen/server/data/model/User.java
similarity index 100%
rename from GoGreen/Server/src/main/java/gogreen/server/data/model/User.java
rename to src/GoGreen/Server/src/main/java/gogreen/server/data/model/User.java
diff --git a/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java b/src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java
similarity index 100%
rename from GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java
rename to src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java
diff --git a/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java b/src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java
similarity index 100%
rename from GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java
rename to src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java
diff --git a/GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java b/src/GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java
similarity index 100%
rename from GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java
rename to src/GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java
diff --git a/GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java b/src/GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java
similarity index 100%
rename from GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java
rename to src/GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java
diff --git a/GoGreen/Server/src/main/java/gogreen/server/service/UserService.java b/src/GoGreen/Server/src/main/java/gogreen/server/service/UserService.java
similarity index 100%
rename from GoGreen/Server/src/main/java/gogreen/server/service/UserService.java
rename to src/GoGreen/Server/src/main/java/gogreen/server/service/UserService.java
diff --git a/GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java b/src/GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java
similarity index 100%
rename from GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java
rename to src/GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java
diff --git a/GoGreen/settings.gradle b/src/GoGreen/settings.gradle
similarity index 100%
rename from GoGreen/settings.gradle
rename to src/GoGreen/settings.gradle