diff --git a/.gitignore b/.gitignore
index 480bdf5..159ea20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,6 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
\ No newline at end of file
+.DS_Store
+
+*.log
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bc3e524..8e9ca13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>3.51.3.0</version>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/java/Client.java b/src/main/java/client/Client.java
similarity index 98%
rename from src/main/java/Client.java
rename to src/main/java/client/Client.java
index 314e55b..74ed93b 100644
--- a/src/main/java/Client.java
+++ b/src/main/java/client/Client.java
@@ -1,3 +1,5 @@
+package client;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/src/main/java/ChatServer.java b/src/main/java/server/ChatServer.java
similarity index 94%
rename from src/main/java/ChatServer.java
rename to src/main/java/server/ChatServer.java
index ab0336a..0ccb35d 100644
--- a/src/main/java/ChatServer.java
+++ b/src/main/java/server/ChatServer.java
@@ -1,3 +1,6 @@
+package server;
+
+import user.User;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -64,7 +67,7 @@ public class ChatServer implements Runnable {
                         String username = msg.substring(6).strip();
                         user = getOrCreateUser(username);
                         clientSockets.add(socket);
-                        logger.info("Client sie połączył");
+                        logger.info("client.Client sie połączył");
                     }
                 }
             }
@@ -81,6 +84,7 @@ public class ChatServer implements Runnable {
         try {
             serverSocket = new ServerSocket(port);
 
+            logger.error("Test");
 
             while (true) {
                 Socket clientSocket = serverSocket.accept();
diff --git a/src/main/java/server/Controller.java b/src/main/java/server/Controller.java
new file mode 100644
index 0000000..ea09c81
--- /dev/null
+++ b/src/main/java/server/Controller.java
@@ -0,0 +1,14 @@
+package server;
+
+public class Controller {
+
+    public void route(String path) {
+
+
+
+    }
+
+
+
+}
+
diff --git a/src/main/java/Main.java b/src/main/java/server/Main.java
similarity index 93%
rename from src/main/java/Main.java
rename to src/main/java/server/Main.java
index 5e19101..497c1c9 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/server/Main.java
@@ -1,11 +1,12 @@
+package server;
+
 public class Main {
+
     public static void main(String[] args) {
         ChatServer chatServer = new ChatServer(9000);
 
-
-
         Thread serverThread = new Thread(chatServer);
         serverThread.start();
-
     }
+
 }
diff --git a/src/main/java/server/Service.java b/src/main/java/server/Service.java
new file mode 100644
index 0000000..6e6590c
--- /dev/null
+++ b/src/main/java/server/Service.java
@@ -0,0 +1,4 @@
+package server;
+
+public class Service {
+}
diff --git a/src/main/java/User.java b/src/main/java/user/User.java
similarity index 63%
rename from src/main/java/User.java
rename to src/main/java/user/User.java
index a5d38f7..636ef77 100644
--- a/src/main/java/User.java
+++ b/src/main/java/user/User.java
@@ -1,5 +1,6 @@
-public class User {
+package user;
 
+public class User {
     private String username;
 
     public User(String username) {
@@ -13,4 +14,11 @@ public class User {
     public void setUsername(String username) {
         this.username = username;
     }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "username='" + username + '\'' +
+                '}';
+    }
 }
diff --git a/src/main/java/user/UserController.java b/src/main/java/user/UserController.java
new file mode 100644
index 0000000..f40363f
--- /dev/null
+++ b/src/main/java/user/UserController.java
@@ -0,0 +1,20 @@
+package user;
+
+import java.util.Optional;
+
+public class UserController {
+
+    private UserService service;
+
+    public UserController(UserService service) {
+        this.service = service;
+    }
+
+    public Optional<User> loginIntoUser(
+            String username,
+            String password
+    ) {
+        return service.loginIntoUser(username, password);
+    }
+
+}
diff --git a/src/main/java/user/UserDao.java b/src/main/java/user/UserDao.java
new file mode 100644
index 0000000..1d370dd
--- /dev/null
+++ b/src/main/java/user/UserDao.java
@@ -0,0 +1,6 @@
+package user;
+
+public class UserDao {
+
+
+}
diff --git a/src/main/java/user/UserService.java b/src/main/java/user/UserService.java
new file mode 100644
index 0000000..6ec5a83
--- /dev/null
+++ b/src/main/java/user/UserService.java
@@ -0,0 +1,29 @@
+package user;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Optional;
+
+public class UserService {
+    private static final Logger logger = LogManager.getLogger();
+
+    private UserDao userDao;
+
+    public UserService(UserDao userDao) {
+        this.userDao = userDao;
+    }
+
+    public Optional<User> loginIntoUser(
+            String username,
+            String pass
+    ) {
+        try {
+            return Optional.empty();
+        } catch (Exception e) {
+            logger.error("Error while login into user: {}", e.toString());
+            return Optional.empty();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index cca3818..fb4d5ab 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -4,7 +4,7 @@
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
         </Console>
-        <File name="File" fileName="all.log" immediateFlush="true" append="true" >
+        <File name="File" fileName="logs/all.log" immediateFlush="true" append="true" >
             <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
         </File>
     </Appenders>
diff --git a/src/test/java/ChatServerTest.java b/src/test/java/ChatServerTest.java
index 47e5979..11e2ed9 100644
--- a/src/test/java/ChatServerTest.java
+++ b/src/test/java/ChatServerTest.java
@@ -1,3 +1,4 @@
+import server.ChatServer;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;