diff --git a/build.gradle b/build.gradle
index 224776c..6c73977 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,5 +79,5 @@ jacocoTestReport {
 }
 
 bootJar {
-    mainClassName = 'GUI.LoginController'
+    mainClassName = 'Client.Application'
 }
diff --git a/classes/production/OOPP/META-INF/OOPP.kotlin_module b/classes/production/OOPP/META-INF/OOPP.kotlin_module
new file mode 100644
index 0000000..8fb6019
Binary files /dev/null and b/classes/production/OOPP/META-INF/OOPP.kotlin_module differ
diff --git a/src/Server/main/java/gogreen/server/data/repository/UserJpaRepository.java b/src/Server/main/java/gogreen/server/data/repository/UserJpaRepository.java
deleted file mode 100644
index 8752efa..0000000
--- a/src/Server/main/java/gogreen/server/data/repository/UserJpaRepository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package gogreen.server.data.repository;
-
-import gogreen.server.data.model.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface UserJpaRepository extends gogreen.server.data.repository.UserRepository, JpaRepository<User,Long> {
-
-}
\ No newline at end of file
diff --git a/src/Client/main/java/gogreen/client/Application.java b/src/main/Client/Application.java
similarity index 80%
rename from src/Client/main/java/gogreen/client/Application.java
rename to src/main/Client/Application.java
index 6697e8d..0ceda67 100644
--- a/src/Client/main/java/gogreen/client/Application.java
+++ b/src/main/Client/Application.java
@@ -1,4 +1,4 @@
-package Client.main.java.gogreen.client;
+package Client;
 
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -6,14 +6,10 @@ import javafx.scene.Scene;
 import javafx.stage.Stage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.client.RestTemplate;
-import static org.springframework.boot.SpringApplication.*;
+
+import static org.springframework.boot.SpringApplication.run;
 
 @SpringBootApplication
 public class Application extends javafx.application.Application {
@@ -40,8 +36,11 @@ public class Application extends javafx.application.Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception{
-        fxmlLoader.setLocation(this.getClass().getClassLoader().getResource("fxml/sample.fxml"));
-        rootNode = fxmlLoader.load();
+        fxmlLoader.setLocation(this.getClass().getClassLoader().getResource("main/Client/fxml/sample.fxml"));
+//        fxmlLoader.setLocation(Client.Application.class.getResource("resources/fxml/sample.fxml"));
+        Parent rootNode = fxmlLoader.load();
+//        Parent root = FXMLLoader.load(getClass().getClassLoader().getResource("sample.fxml"));
+//        Image image = new Image("pinkleaf.png");
 
 //        rootNode = FXMLLoader.load(this.getClass().getClassLoader().getResource("fxml/sample.fxml"));
 
diff --git a/src/Client/main/java/gogreen/client/controller/UserController.java b/src/main/Client/controller/UserController.java
similarity index 92%
rename from src/Client/main/java/gogreen/client/controller/UserController.java
rename to src/main/Client/controller/UserController.java
index 2878cf8..5b6da47 100644
--- a/src/Client/main/java/gogreen/client/controller/UserController.java
+++ b/src/main/Client/controller/UserController.java
@@ -1,17 +1,12 @@
-package gogreen.client.controller;
+package Client.controller;
 
-import gogreen.client.rest.UserService;
+import Client.rest.UserService;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
-import javafx.stage.Stage;
 import javafx.stage.Window;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/Client/main/resources/application.properties b/src/main/Client/resources/application.properties
similarity index 100%
rename from src/Client/main/resources/application.properties
rename to src/main/Client/resources/application.properties
diff --git a/src/Client/main/resources/fxml/dashboard.fxml b/src/main/Client/resources/fxml/dashboard.fxml
similarity index 100%
rename from src/Client/main/resources/fxml/dashboard.fxml
rename to src/main/Client/resources/fxml/dashboard.fxml
diff --git a/src/Client/main/resources/fxml/sample.fxml b/src/main/Client/resources/fxml/sample.fxml
similarity index 88%
rename from src/Client/main/resources/fxml/sample.fxml
rename to src/main/Client/resources/fxml/sample.fxml
index f0dc2db..0af02f3 100644
--- a/src/Client/main/resources/fxml/sample.fxml
+++ b/src/main/Client/resources/fxml/sample.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane fx:controller="gogreen.client.controller.UserController" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="574.0" prefWidth="934.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane fx:controller="Client.controller.UserController" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="574.0" prefWidth="934.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <ImageView fitHeight="574.0" fitWidth="943.0" layoutX="-1.0" pickOnBounds="true">
             <image>
diff --git a/src/Client/main/resources/pinkleaf.jpg b/src/main/Client/resources/pinkleaf.jpg
similarity index 100%
rename from src/Client/main/resources/pinkleaf.jpg
rename to src/main/Client/resources/pinkleaf.jpg
diff --git a/src/Client/main/java/gogreen/client/rest/UserService.java b/src/main/Client/rest/UserService.java
similarity index 95%
rename from src/Client/main/java/gogreen/client/rest/UserService.java
rename to src/main/Client/rest/UserService.java
index b88a610..456646e 100644
--- a/src/Client/main/java/gogreen/client/rest/UserService.java
+++ b/src/main/Client/rest/UserService.java
@@ -1,6 +1,6 @@
-package gogreen.client.rest;
+package Client.rest;
 
-import gogreen.common.UserDTO;
+import Common.UserDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
diff --git a/src/Client/test/java/UserServiceTest.java b/src/main/Client/test/java/UserServiceTest.java
similarity index 97%
rename from src/Client/test/java/UserServiceTest.java
rename to src/main/Client/test/java/UserServiceTest.java
index bb05b83..dd8980a 100644
--- a/src/Client/test/java/UserServiceTest.java
+++ b/src/main/Client/test/java/UserServiceTest.java
@@ -1,3 +1,5 @@
+package Client.test.java;
+
 //import gogreen.client.rest.UserService;
 //import gogreen.common.UserDTO;
 //import org.junit.Assert;
diff --git a/src/Common/main/java/gogreen/common/ApplicationException.java b/src/main/Common/ApplicationException.java
similarity index 85%
rename from src/Common/main/java/gogreen/common/ApplicationException.java
rename to src/main/Common/ApplicationException.java
index 76e923e..960b71f 100644
--- a/src/Common/main/java/gogreen/common/ApplicationException.java
+++ b/src/main/Common/ApplicationException.java
@@ -1,4 +1,4 @@
-package gogreen.common;
+package Common;
 
 public class ApplicationException extends RuntimeException {
     public ApplicationException(String message) {
diff --git a/src/Common/main/java/gogreen/common/ErrorResponse.java b/src/main/Common/ErrorResponse.java
similarity index 92%
rename from src/Common/main/java/gogreen/common/ErrorResponse.java
rename to src/main/Common/ErrorResponse.java
index e2fe1e6..e69d91f 100644
--- a/src/Common/main/java/gogreen/common/ErrorResponse.java
+++ b/src/main/Common/ErrorResponse.java
@@ -1,4 +1,4 @@
-package gogreen.common;
+package Common;
 
 public class ErrorResponse {
     String message;
diff --git a/src/Common/main/java/gogreen/common/UserDTO.java b/src/main/Common/UserDTO.java
similarity index 92%
rename from src/Common/main/java/gogreen/common/UserDTO.java
rename to src/main/Common/UserDTO.java
index 9cd969d..1534325 100644
--- a/src/Common/main/java/gogreen/common/UserDTO.java
+++ b/src/main/Common/UserDTO.java
@@ -1,4 +1,4 @@
-package gogreen.common;
+package Common;
 
 public class UserDTO {
 
diff --git a/src/Server/main/java/gogreen/server/Application.java b/src/main/Server/Application.java
similarity index 92%
rename from src/Server/main/java/gogreen/server/Application.java
rename to src/main/Server/Application.java
index 682bb66..7c9084d 100644
--- a/src/Server/main/java/gogreen/server/Application.java
+++ b/src/main/Server/Application.java
@@ -1,4 +1,4 @@
-package gogreen.server;
+package Server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/Server/data/gogreen/repository/UserJpaRepository.java b/src/main/Server/data/gogreen/repository/UserJpaRepository.java
new file mode 100644
index 0000000..4e3181e
--- /dev/null
+++ b/src/main/Server/data/gogreen/repository/UserJpaRepository.java
@@ -0,0 +1,8 @@
+package Server.data.gogreen.repository;
+
+import Server.data.model.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UserJpaRepository extends Server.data.gogreen.repository.UserRepository, JpaRepository<User,Long> {
+
+}
\ No newline at end of file
diff --git a/src/Server/main/java/gogreen/server/data/repository/UserRepository.java b/src/main/Server/data/gogreen/repository/UserRepository.java
similarity index 57%
rename from src/Server/main/java/gogreen/server/data/repository/UserRepository.java
rename to src/main/Server/data/gogreen/repository/UserRepository.java
index 2f4a5e6..5af7e7e 100644
--- a/src/Server/main/java/gogreen/server/data/repository/UserRepository.java
+++ b/src/main/Server/data/gogreen/repository/UserRepository.java
@@ -1,6 +1,6 @@
-package gogreen.server.data.repository;
+package Server.data.gogreen.repository;
 
-import gogreen.server.data.model.User;
+import Server.data.model.User;
 
 public interface UserRepository {
     User findByName(String name);
diff --git a/src/Server/main/java/gogreen/server/data/model/User.java b/src/main/Server/data/model/User.java
similarity index 54%
rename from src/Server/main/java/gogreen/server/data/model/User.java
rename to src/main/Server/data/model/User.java
index 2152c91..e0227d9 100644
--- a/src/Server/main/java/gogreen/server/data/model/User.java
+++ b/src/main/Server/data/model/User.java
@@ -1,4 +1,4 @@
-package gogreen.server.data.model;
+package Server.data.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -19,4 +19,22 @@ public class User {
     Long id;
     String name;
     String password;
+
+    public User(Long id, String name, String password) {
+        this.id = id;
+        this.name = name;
+        this.password = password;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getPassword() {
+        return password;
+    }
 }
\ No newline at end of file
diff --git a/src/Server/main/java/gogreen/server/rest/RestExceptionHandler.java b/src/main/Server/rest/RestExceptionHandler.java
similarity index 82%
rename from src/Server/main/java/gogreen/server/rest/RestExceptionHandler.java
rename to src/main/Server/rest/RestExceptionHandler.java
index 18d2a04..d7a1ca5 100644
--- a/src/Server/main/java/gogreen/server/rest/RestExceptionHandler.java
+++ b/src/main/Server/rest/RestExceptionHandler.java
@@ -1,7 +1,7 @@
-package gogreen.server.rest;
+package Server.rest;
 
-import gogreen.common.ApplicationException;
-import gogreen.common.ErrorResponse;
+import Common.ApplicationException;
+import Common.ErrorResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/src/Server/main/java/gogreen/server/rest/UserController.java b/src/main/Server/rest/UserController.java
similarity index 88%
rename from src/Server/main/java/gogreen/server/rest/UserController.java
rename to src/main/Server/rest/UserController.java
index b6f9655..40cb797 100644
--- a/src/Server/main/java/gogreen/server/rest/UserController.java
+++ b/src/main/Server/rest/UserController.java
@@ -1,7 +1,7 @@
-package gogreen.server.rest;
+package Server.rest;
 
-import gogreen.common.UserDTO;
-import gogreen.server.service.UserService;
+import Common.UserDTO;
+import Server.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
diff --git a/src/Server/main/java/gogreen/server/service/UserService.java b/src/main/Server/service/UserService.java
similarity index 85%
rename from src/Server/main/java/gogreen/server/service/UserService.java
rename to src/main/Server/service/UserService.java
index dbd40d6..594c6ef 100644
--- a/src/Server/main/java/gogreen/server/service/UserService.java
+++ b/src/main/Server/service/UserService.java
@@ -1,9 +1,9 @@
-package gogreen.server.service;
+package Server.service;
 
-import gogreen.common.ApplicationException;
-import gogreen.common.UserDTO;
-import gogreen.server.data.model.User;
-import gogreen.server.data.repository.UserRepository;
+import Common.ApplicationException;
+import Common.UserDTO;
+import Server.data.model.User;
+import Server.data.gogreen.repository.UserRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/Server/test/java/gogreen/server/rest/UserControllerTest.java b/src/main/Server/test/rest/UserControllerTest.java
similarity index 94%
rename from src/Server/test/java/gogreen/server/rest/UserControllerTest.java
rename to src/main/Server/test/rest/UserControllerTest.java
index c7c4f8a..3c4af1a 100644
--- a/src/Server/test/java/gogreen/server/rest/UserControllerTest.java
+++ b/src/main/Server/test/rest/UserControllerTest.java
@@ -1,7 +1,11 @@
-package gogreen.server.rest;
+package Server.test.rest;
 
-import gogreen.common.UserDTO;
-import gogreen.server.Application;
+import Common.UserDTO;
+
+import Server.Application;
+//import Client.Application;
+
+////////////
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;