diff --git a/doc/reports/sprint-reviews/20190225_sprint_review.md b/doc/reports/sprint-reviews/20190225_sprint_review.md
deleted file mode 100644
index 6adcb33..0000000
--- a/doc/reports/sprint-reviews/20190225_sprint_review.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# Sprint Review
-
-## Main problems  Encountered
-
-We have no problems so far. Everyone arrives on time and does the tasks assigned to them.
-
-## Adjustments from previous sprints
-Since this is the first review, there are no previous sprints yet
-
-## Adjustments for next sprint
- - Keep up the good work!
diff --git a/doc/reports/sprint-reviews/20190311_sprint_review.md b/doc/reports/sprint-reviews/20190311_sprint_review.md
deleted file mode 100644
index d4d255b..0000000
--- a/doc/reports/sprint-reviews/20190311_sprint_review.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Sprint Review
-
-## Main problems  Encountered
-
-### Problem 1: Kristin left the group
-Kristin does not continue CSE and left our group. We'll work with five people from now on.
-
-## Adjustments from previous sprints
-We created the backlog before the sprint, which helps making clear what we're working on.
-
-## Adjustments for next sprint
- - Group made out of five
- - Backlogs ready on time
diff --git a/doc/sprints/sprint1/20190225_scrumboard.png b/doc/sprints/sprint1/20190403_scrumboard.png
similarity index 100%
rename from doc/sprints/sprint1/20190225_scrumboard.png
rename to doc/sprints/sprint1/20190403_scrumboard.png
diff --git a/doc/sprints/sprint2/20190311_scrumboard.png b/doc/sprints/sprint2/20191003_scrumboard.png
similarity index 100%
rename from doc/sprints/sprint2/20190311_scrumboard.png
rename to doc/sprints/sprint2/20191003_scrumboard.png
diff --git a/src/.idea/gradle.xml b/src/.idea/gradle.xml
index 6321230..fb07249 100644
--- a/src/.idea/gradle.xml
+++ b/src/.idea/gradle.xml
@@ -8,6 +8,7 @@
         <option name="gradleHome" value="$USER_HOME$/scoop/apps/gradle/current" />
         <option name="modules">
           <set>
+            <option value="$PROJECT_DIR$/.." />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/Client" />
             <option value="$PROJECT_DIR$/Common" />
diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/src/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml
index da31729..d7cd59b 100644
--- a/src/.idea/workspace.xml
+++ b/src/.idea/workspace.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="317f638e-9a63-4072-b3f3-0ddf783c2024" name="Default Changelist" comment="" />
+    <list default="true" id="317f638e-9a63-4072-b3f3-0ddf783c2024" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/../build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/../build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../doc/reports/sprint-reviews/20190225_sprint_review.md" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../doc/reports/sprint-reviews/20190311_sprint_review.md" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../doc/sprints/sprint1/20190225_scrumboard.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../doc/sprints/sprint2/20190311_scrumboard.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/checkstyle-idea.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/checkstyle-idea.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Client/src/main/java/greenify/client/Application.java" beforeDir="false" afterPath="$PROJECT_DIR$/Client/src/main/java/greenify/client/Application.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/UserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Common/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/Common/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Common/src/main/java/greenify/common/ErrorResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/Common/src/main/java/greenify/common/ErrorResponse.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Common/src/main/java/greenify/common/UserDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/Common/src/main/java/greenify/common/UserDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/Server/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/model/User.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserJpaRepository.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/UserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/main/java/greenify/server/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/main/java/greenify/server/service/UserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/test/java/ApplicationTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/test/java/ApplicationTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/test/java/UserControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/test/java/UserControllerTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/test/java/UserTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/test/java/UserTest.java" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/.gradle/" />
     <ignored path="$PROJECT_DIR$/build/" />
     <ignored path="$PROJECT_DIR$/Client/.gradle/" />
@@ -13,6 +36,9 @@
     <ignored path="$PROJECT_DIR$/Server/.gradle/" />
     <ignored path="$PROJECT_DIR$/Server/build/" />
     <ignored path="$PROJECT_DIR$/Server/out/" />
+    <ignored path="$PROJECT_DIR$/../.gradle/" />
+    <ignored path="$PROJECT_DIR$/../build/" />
+    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -60,32 +86,90 @@
             <expand>
               <path>
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="OOPP" type="f1a62948:ProjectNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
               </path>
               <path>
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="OOPP" type="f1a62948:ProjectNode" />
-                <item name=":Server" type="2d1252cf:ModuleNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Client" type="2d1252cf:ModuleNode" />
               </path>
               <path>
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="OOPP" type="f1a62948:ProjectNode" />
-                <item name=":Server" type="2d1252cf:ModuleNode" />
-                <item name="Source Sets" type="e897c970:GradleViewContributor$SourceSetsNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="OOPP" type="f1a62948:ProjectNode" />
-                <item name=":Server" type="2d1252cf:ModuleNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Client" type="2d1252cf:ModuleNode" />
                 <item name="Tasks" type="e4a08cd1:TasksNode" />
               </path>
               <path>
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="OOPP" type="f1a62948:ProjectNode" />
-                <item name=":Server" type="2d1252cf:ModuleNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Client" type="2d1252cf:ModuleNode" />
                 <item name="Tasks" type="e4a08cd1:TasksNode" />
                 <item name="application" type="c8890929:TasksNode$1" />
               </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Client" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="verification" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Common" type="2d1252cf:ModuleNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Common" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Common" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="build" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Common" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="verification" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Server" type="2d1252cf:ModuleNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Server" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Server" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="application" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Server" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="build" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="src" type="f1a62948:ProjectNode" />
+                <item name=":src:Server" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="verification" type="c8890929:TasksNode$1" />
+              </path>
             </expand>
             <select />
           </tree_state>
@@ -96,10 +180,22 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/service/UserService.java">
+        <entry file="file://$PROJECT_DIR$/Server/src/test/java/UserControllerTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="408">
-              <caret line="31" column="66" selection-start-line="31" selection-start-column="66" selection-end-line="31" selection-end-column="66" />
+            <state>
+              <caret selection-start-column="2" selection-end-line="45" selection-end-column="3" />
+              <folding>
+                <element signature="e#0#2135#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/test/java/UserTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="377">
+              <caret line="46" selection-start-line="46" selection-end-line="46" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -110,77 +206,71 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Server/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="4" column="18" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="18" />
+            <state relative-caret-position="1088">
+              <caret line="64" column="1" selection-start-line="64" selection-start-column="1" selection-end-line="64" selection-end-column="1" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/test/java/UserServiceTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="184">
-              <caret line="32" column="1" selection-start-line="32" selection-start-column="1" selection-end-line="32" selection-end-column="1" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/settings.gradle">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="4" column="16" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java">
+        <entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/ApplicationException.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="85">
-              <caret line="6" selection-start-line="6" selection-end-line="6" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+              <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/rest/UserService.java">
+        <entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/ErrorResponse.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="103">
-              <caret line="24" column="108" selection-start-line="24" selection-start-column="72" selection-end-line="24" selection-end-column="108" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="204">
+              <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/controller/UserController.java">
+        <entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/UserDTO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="318">
-              <caret line="75" column="5" lean-forward="true" selection-start-line="75" selection-start-column="5" selection-end-line="75" selection-end-column="5" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="187">
+              <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/Application.java">
+        <entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/DashBoardController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="369">
-              <caret line="54" column="16" selection-start-line="54" selection-start-column="16" selection-end-line="54" selection-end-column="16" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="422">
+              <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="72" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/rest/UserService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="17">
+              <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/Application.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="544">
+              <caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/UserController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="17">
+              <caret line="77" column="4" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
             </state>
           </provider>
         </entry>
@@ -195,6 +285,9 @@
       </list>
     </option>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
@@ -213,13 +306,34 @@
         <option value="$PROJECT_DIR$/Server/src/main/java/gogreen/server/service/UserService.java" />
         <option value="$PROJECT_DIR$/Client/src/test/java/UserControllerTest.java" />
         <option value="$PROJECT_DIR$/config/checkstyle/checkstyle.xml" />
-        <option value="$PROJECT_DIR$/Common/build.gradle" />
         <option value="$PROJECT_DIR$/Client/build.gradle" />
         <option value="$PROJECT_DIR$/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java" />
-        <option value="$PROJECT_DIR$/Server/build.gradle" />
         <option value="$PROJECT_DIR$/Common/src/test/java/gogreen/common/UserDTOTest.java" />
         <option value="$PROJECT_DIR$/Client/src/main/java/gogreen/client/rest/UserService.java" />
         <option value="$PROJECT_DIR$/Client/src/test/java/UserServiceTest.java" />
+        <option value="$PROJECT_DIR$/../build.gradle" />
+        <option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserJpaRepository.java" />
+        <option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserRepository.java" />
+        <option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/MainController.java" />
+        <option value="$PROJECT_DIR$/Common/src/test/java/ErrorResponseTest.java" />
+        <option value="$PROJECT_DIR$/Common/src/main/java/greenify/common/ErrorResponse.java" />
+        <option value="$PROJECT_DIR$/Common/src/main/java/greenify/common/UserDTO.java" />
+        <option value="$PROJECT_DIR$/Common/src/test/java/UserDTOTest.java" />
+        <option value="$PROJECT_DIR$/Server/src/test/java/UserTest.java" />
+        <option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/UserController.java" />
+        <option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/service/UserService.java" />
+        <option value="$PROJECT_DIR$/Server/src/test/java/MainControllerTest.java" />
+        <option value="$PROJECT_DIR$/Server/src/resources/application.properties" />
+        <option value="$PROJECT_DIR$/Server/src/application.properties" />
+        <option value="$PROJECT_DIR$/Server/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/Server/src/test/java/ApplicationTest.java" />
+        <option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/model/User.java" />
+        <option value="$PROJECT_DIR$/Server/src/test/java/UserControllerTest.java" />
+        <option value="$PROJECT_DIR$/Common/build.gradle" />
+        <option value="$PROJECT_DIR$/Server/build.gradle" />
+        <option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/UserController.java" />
+        <option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/Application.java" />
+        <option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/DashBoardController.java" />
       </list>
     </option>
   </component>
@@ -229,25 +343,81 @@
       <select />
     </treeState>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-10" />
-    <option name="y" value="-10" />
-    <option name="width" value="1940" />
-    <option name="height" value="1050" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="-9" />
+    <option name="width" value="689" />
+    <option name="height" value="1039" />
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="Scope" currentSubView="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope" proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="ProjectPane" />
       <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
+      <pane id="Scope">
+        <subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope">
           <expand>
             <path>
-              <item name="OOPP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="OOPP" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+            </path>
+            <path>
+              <item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+            </path>
+            <path>
+              <item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="Client" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+            </path>
+            <path>
+              <item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="Client" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="main" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+            </path>
+            <path>
+              <item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="Client" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="main" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="java" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+            </path>
+            <path>
+              <item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="Client" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="main" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="java" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="greenify" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+            </path>
+            <path>
+              <item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="Client" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="main" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="java" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="greenify" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="client" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+            </path>
+            <path>
+              <item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="Client" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="main" type="2674bda8:ScopeViewTreeModel$GroupNode" />
+              <item name="java" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="greenify" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="client" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="controller" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
           </expand>
           <select />
@@ -261,11 +431,12 @@
     <property name="Repository.Attach.JavaDocs" value="false" />
     <property name="Repository.Attach.Sources" value="false" />
     <property name="ToolWindowCheckStyle.ShowToolbar" value="false" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552069533575" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552741125592" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="org.infernus.idea.checkstyle.CheckStyleConfigurable" />
   </component>
   <component name="RecentsManager">
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
@@ -284,8 +455,8 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Gradle.OOPP:Server [bootRun]">
-    <configuration name="OOPP:Client [bootRun]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+  <component name="RunManager" selected="Gradle.src:Client [bootRun]">
+    <configuration name="src:Client [bootRun]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$/Client" />
@@ -304,7 +475,7 @@
       <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
       <method v="2" />
     </configuration>
-    <configuration name="OOPP:Client [test]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="src:Client [jacocoTestCoverageVerification]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$/Client" />
@@ -315,7 +486,7 @@
         </option>
         <option name="taskNames">
           <list>
-            <option value="test" />
+            <option value="jacocoTestCoverageVerification" />
           </list>
         </option>
         <option name="vmOptions" />
@@ -323,7 +494,45 @@
       <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
       <method v="2" />
     </configuration>
-    <configuration name="OOPP:Server [bootRun]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="src:Client [jacocoTestReport]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$/Client" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value="jacocoTestReport" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+      <method v="2" />
+    </configuration>
+    <configuration name="src:Common [buildDependents]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$/Common" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value="buildDependents" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+      <method v="2" />
+    </configuration>
+    <configuration name="src:Server [bootRun]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$/Server" />
@@ -342,14 +551,6 @@
       <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
       <method v="2" />
     </configuration>
-    <configuration name="All in OOPP" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="OOPP" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="TEST_OBJECT" value="package" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="UserControllerTest" type="JUnit" factoryName="JUnit" nameIsGenerated="true">
       <module name="OOPP.Server.test" />
       <extension name="coverage">
@@ -365,22 +566,13 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="UserServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="OOPP.Client.test" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="UserServiceTest" />
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Gradle.OOPP:Server [bootRun]" />
-        <item itemvalue="JUnit.UserServiceTest" />
-        <item itemvalue="JUnit.All in OOPP" />
-        <item itemvalue="Gradle.OOPP:Client [bootRun]" />
-        <item itemvalue="Gradle.OOPP:Client [test]" />
+        <item itemvalue="Gradle.src:Client [bootRun]" />
+        <item itemvalue="Gradle.src:Server [bootRun]" />
+        <item itemvalue="Gradle.src:Common [buildDependents]" />
+        <item itemvalue="Gradle.src:Client [jacocoTestCoverageVerification]" />
+        <item itemvalue="Gradle.src:Client [jacocoTestReport]" />
       </list>
     </recent_temporary>
   </component>
@@ -398,35 +590,35 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="OOPP_Client_[test] - 2019.03.06 at 22h 07m 00s.xml">
-      <configuration name="OOPP:Client [test]" configurationId="GradleRunConfiguration" />
+    <history-entry file="src_Server_[test] - 2019.03.16 at 13h 44m 28s.xml">
+      <configuration name="src:Server [test]" configurationId="GradleRunConfiguration" />
     </history-entry>
-    <history-entry file="OOPP_Client_[test] - 2019.03.06 at 22h 09m 27s.xml">
-      <configuration name="OOPP:Client [test]" configurationId="GradleRunConfiguration" />
+    <history-entry file="src_Server_[test] - 2019.03.16 at 13h 47m 09s.xml">
+      <configuration name="src:Server [test]" configurationId="GradleRunConfiguration" />
     </history-entry>
-    <history-entry file="OOPP_Client_[test] - 2019.03.06 at 22h 30m 41s.xml">
-      <configuration name="OOPP:Client [test]" configurationId="GradleRunConfiguration" />
+    <history-entry file="src_Server_[test] - 2019.03.16 at 13h 47m 26s.xml">
+      <configuration name="src:Server [test]" configurationId="GradleRunConfiguration" />
     </history-entry>
-    <history-entry file="OOPP_Client_[test] - 2019.03.06 at 22h 34m 21s.xml">
-      <configuration name="OOPP:Client [test]" configurationId="GradleRunConfiguration" />
+    <history-entry file="src_Common_[test] - 2019.03.16 at 13h 48m 13s.xml">
+      <configuration name="src:Common [test]" configurationId="GradleRunConfiguration" />
     </history-entry>
-    <history-entry file="OOPP_Client_[test] - 2019.03.06 at 22h 36m 15s.xml">
-      <configuration name="OOPP:Client [test]" configurationId="GradleRunConfiguration" />
+    <history-entry file="src_Common_[test] - 2019.03.16 at 13h 48m 18s.xml">
+      <configuration name="src:Common [test]" configurationId="GradleRunConfiguration" />
     </history-entry>
-    <history-entry file="UserServiceTest - 2019.03.06 at 22h 36m 33s.xml">
-      <configuration name="UserServiceTest" configurationId="JUnit" />
+    <history-entry file="src_Common_[test] - 2019.03.16 at 13h 48m 29s.xml">
+      <configuration name="src:Common [test]" configurationId="GradleRunConfiguration" />
     </history-entry>
-    <history-entry file="UserControllerTest - 2019.03.06 at 22h 37m 15s.xml">
-      <configuration name="UserControllerTest" configurationId="JUnit" />
+    <history-entry file="src_Common_[test] - 2019.03.16 at 13h 49m 26s.xml">
+      <configuration name="src:Common [test]" configurationId="GradleRunConfiguration" />
     </history-entry>
-    <history-entry file="OOPP_Client_[test] - 2019.03.06 at 22h 41m 25s.xml">
-      <configuration name="OOPP:Client [test]" configurationId="GradleRunConfiguration" />
+    <history-entry file="ErrorResponseTest - 2019.03.16 at 13h 49m 37s.xml">
+      <configuration name="ErrorResponseTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="UserServiceTest - 2019.03.06 at 23h 07m 59s.xml">
-      <configuration name="UserServiceTest" configurationId="JUnit" />
+    <history-entry file="src_Client_[test] - 2019.03.16 at 13h 50m 28s.xml">
+      <configuration name="src:Client [test]" configurationId="GradleRunConfiguration" />
     </history-entry>
-    <history-entry file="UserControllerTest - 2019.03.06 at 23h 08m 31s.xml">
-      <configuration name="UserControllerTest" configurationId="JUnit" />
+    <history-entry file="All_in_OOPP_src_Client_test - 2019.03.16 at 13h 51m 04s.xml">
+      <configuration name="All in OOPP.src.Client.test" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TodoView">
@@ -440,66 +632,67 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49789914" visible="true" weight="0.17785235" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49789914" visible="true" weight="0.2557047" />
       <window_info id="Structure" order="1" sideWeight="0.5021008" side_tool="true" weight="0.17315437" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
       <window_info id="Capture Tool" order="4" />
       <window_info id="UI Designer" order="5" />
       <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4986577" weight="0.3286119" />
+      <window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4986577" weight="0.32808024" />
       <window_info anchor="bottom" id="Message" order="1" />
       <window_info anchor="bottom" id="Find" order="2" />
-      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.88724834" weight="0.4546742" />
+      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.88724834" visible="true" weight="0.28611898" />
       <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="7" weight="0.3286119" />
-      <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49932885" weight="0.3286119" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.32808024" />
+      <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49932885" weight="0.32719547" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.11275168" side_tool="true" weight="0.43201134" />
-      <window_info anchor="bottom" id="Version Control" order="10" />
+      <window_info anchor="bottom" id="Version Control" order="10" weight="0.3286119" />
       <window_info anchor="bottom" id="Build" order="11" weight="0.3286119" />
-      <window_info anchor="bottom" id="CheckStyle" order="12" weight="0.32577905" />
+      <window_info anchor="bottom" id="CheckStyle" order="12" weight="0.3295129" />
       <window_info anchor="right" id="Coverage" order="0" sideWeight="0.8077922" side_tool="true" visible="true" weight="0.4395973" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="2" weight="0.24966443" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Maven" order="5" weight="0.32885906" />
-      <window_info anchor="right" id="Gradle" order="6" sideWeight="0.1922078" weight="0.4395973" />
+      <window_info anchor="right" id="Gradle" order="6" sideWeight="0.1922078" visible="true" weight="0.17114094" />
       <window_info anchor="right" id="Theme Preview" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="8" />
       <window_info anchor="right" id="Palette&#9;" order="9" />
     </layout>
     <layout-to-restore>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49789914" visible="true" weight="0.17516778" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49789914" visible="true" weight="0.3883495" />
       <window_info id="Structure" order="1" sideWeight="0.5021008" side_tool="true" weight="0.17315437" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
       <window_info id="Capture Tool" order="4" />
       <window_info id="UI Designer" order="5" />
       <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4986577" weight="0.3286119" />
+      <window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4986577" weight="0.32808024" />
       <window_info anchor="bottom" id="Message" order="1" />
       <window_info anchor="bottom" id="Find" order="2" />
-      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.88724834" weight="0.4546742" />
+      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.88724834" weight="0.2875354" />
       <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="7" weight="0.3286119" />
-      <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49932885" weight="0.3286119" />
+      <window_info anchor="bottom" id="TODO" order="7" weight="0.32808024" />
+      <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49932885" weight="0.32808024" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.11275168" side_tool="true" weight="0.43201134" />
       <window_info anchor="bottom" id="Version Control" order="10" />
       <window_info anchor="bottom" id="Build" order="11" weight="0.3286119" />
-      <window_info anchor="bottom" id="CheckStyle" order="12" weight="0.32577905" />
-      <window_info anchor="right" id="Coverage" order="0" sideWeight="0.8258824" side_tool="true" weight="0.51342285" />
+      <window_info anchor="bottom" id="CheckStyle" order="12" weight="0.3295129" />
+      <window_info anchor="right" id="Coverage" order="0" sideWeight="0.8077922" side_tool="true" visible="true" weight="0.4395973" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="2" weight="0.24966443" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Maven" order="5" weight="0.32885906" />
-      <window_info anchor="right" id="Gradle" order="6" sideWeight="0.17411764" weight="0.2181208" />
+      <window_info anchor="right" id="Gradle" order="6" sideWeight="0.1922078" weight="0.2524272" />
       <window_info anchor="right" id="Theme Preview" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="8" />
       <window_info anchor="right" id="Palette&#9;" order="9" />
@@ -510,53 +703,7 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/model/User.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" selection-start-line="15" selection-end-line="15" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/main/resources/fxml/dashboard.fxml">
-      <provider editor-type-id="JavaFX-Scene-Builder" />
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/rest/UserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
-          <caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/build/reports/tests/test/index.html" />
-    <entry file="file://$PROJECT_DIR$/Client/src/test/java/UserControllerTest.java" />
-    <entry file="file://$PROJECT_DIR$/config/checkstyle/suppressions.xml" />
-    <entry file="file://$PROJECT_DIR$/Client/src/main/resources/fxml/sample.fxml">
-      <provider editor-type-id="JavaFX-Scene-Builder" />
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="33" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/config/checkstyle/checkstyle.xml" />
-    <entry file="file://$PROJECT_DIR$/Common/build.gradle">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="141">
-          <caret line="32" selection-start-line="10" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="243">
@@ -564,73 +711,209 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/Application.java">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/Application.java" />
     <entry file="file://$PROJECT_DIR$/.project">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/Common/src/main/java/gogreen/common/ErrorResponse.java">
+    <entry file="file://$PROJECT_DIR$/Common/src/main/java/gogreen/common/ErrorResponse.java" />
+    <entry file="file://$PROJECT_DIR$/Common/src/main/java/gogreen/common/UserDTO.java" />
+    <entry file="file://$PROJECT_DIR$/Common/src/test/java/gogreen/common/UserDTOTest.java" />
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java" />
+    <entry file="file://$PROJECT_DIR$/Common/src/main/java/gogreen/common/ApplicationException.java" />
+    <entry file="file://$PROJECT_DIR$/Server/src/test/java/gogreen/server/rest/UserControllerTest.java" />
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/repository/UserRepository.java" />
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/service/UserService.java" />
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java" />
+    <entry file="file://$PROJECT_DIR$/settings.gradle" />
+    <entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/rest/UserService.java" />
+    <entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/controller/UserController.java" />
+    <entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/Application.java" />
+    <entry file="file://$PROJECT_DIR$/Client/src/test/java/UserServiceTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <state relative-caret-position="391">
+          <caret line="32" column="1" selection-start-line="32" selection-start-column="1" selection-end-line="32" selection-end-column="1" />
           <folding>
-            <element signature="e#116#117#0" expanded="true" />
-            <element signature="e#154#155#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Common/src/main/java/gogreen/common/UserDTO.java">
+    <entry file="file://$PROJECT_DIR$/../settings.gradle">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="22" column="1" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="1" />
+        <state relative-caret-position="221">
+          <caret line="19" selection-start-line="19" selection-end-line="19" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Common/src/test/java/gogreen/common/UserDTOTest.java" />
-    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java">
+    <entry file="file://$PROJECT_DIR$/Server/build/reports/tests/test/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2556" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/resources/application.properties" />
+    <entry file="file://$PROJECT_DIR$/Server/src/application.properties" />
+    <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework/spring-test/5.0.9.RELEASE/e1e6cff03e69e4db489d723c9a1c91afe8e0c637/spring-test-5.0.9.RELEASE-sources.jar!/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1513">
+          <caret line="124" selection-start-line="124" selection-end-line="124" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/service/UserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="782">
+          <caret line="53" selection-start-line="53" selection-end-line="53" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/test/java/MainControllerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-332">
+          <caret line="6" column="61" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Common/src/test/java/ErrorResponseTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="1" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="1" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Common/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
-          <caret line="12" column="43" lean-forward="true" selection-start-line="12" selection-start-column="43" selection-end-line="12" selection-end-column="43" />
+          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserJpaRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="3" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
+          <folding>
+            <element signature="e#0#249#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Common/src/test/java/UserDTOTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="24" column="1" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Common/src/main/java/gogreen/common/ApplicationException.java">
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/data/model/User.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-          <folding>
-            <element signature="e#134#135#0" expanded="true" />
-            <element signature="e#164#165#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/test/java/gogreen/server/rest/UserControllerTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        <state relative-caret-position="323">
+          <caret line="19" column="12" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/repository/UserRepository.java">
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
+        <state relative-caret-position="102">
+          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/service/UserService.java">
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/MainController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="31" column="66" selection-start-line="31" selection-start-column="66" selection-end-line="31" selection-end-column="66" />
+        <state relative-caret-position="578">
+          <caret line="34" column="47" selection-start-line="34" selection-start-column="47" selection-end-line="34" selection-end-column="47" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/RestExceptionHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/UserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="19" column="1" selection-start-line="19" selection-start-column="1" selection-end-line="19" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/Application.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
+          <folding>
+            <element signature="e#241#242#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/test/java/ApplicationTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
+          <folding>
+            <element signature="e#0#411#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/test/java/UserControllerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-start-column="2" selection-end-line="45" selection-end-column="3" />
+          <folding>
+            <element signature="e#0#2135#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/test/java/UserTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="46" selection-start-line="46" selection-end-line="46" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -639,65 +922,57 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Server/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="18" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="18" />
+        <state relative-caret-position="1088">
+          <caret line="64" column="1" selection-start-line="64" selection-start-column="1" selection-end-line="64" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java">
+    <entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/ApplicationException.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="85">
-          <caret line="6" selection-start-line="6" selection-end-line="6" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/test/java/UserServiceTest.java">
+    <entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/ErrorResponse.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="32" column="1" selection-start-line="32" selection-start-column="1" selection-end-line="32" selection-end-column="1" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="204">
+          <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/settings.gradle">
+    <entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/UserDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="16" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="16" />
+        <state relative-caret-position="187">
+          <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/rest/UserService.java">
+    <entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/UserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="24" column="108" selection-start-line="24" selection-start-column="72" selection-end-line="24" selection-end-column="108" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="17">
+          <caret line="77" column="4" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/controller/UserController.java">
+    <entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/rest/UserService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="75" column="5" lean-forward="true" selection-start-line="75" selection-start-column="5" selection-end-line="75" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="17">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/Application.java">
+    <entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/Application.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="369">
-          <caret line="54" column="16" selection-start-line="54" selection-start-column="16" selection-end-line="54" selection-end-column="16" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="544">
+          <caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/DashBoardController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="422">
+          <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="72" selection-end-column="11" />
         </state>
       </provider>
     </entry>