diff --git a/.gitignore b/.gitignore
index 9e2927d..af9f367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,50 +1,2 @@
-# Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-.classpath
-.project
-.settings
-~*
-*.idea
-*.iml
-MANIFEST.MF
-
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-
-# Logs and databases #
-######################
-*.log
-*.sqlite
-
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-
-# Directory #
-#############
-bin/
-out/
-target/
-.vscode/launch.json
+/module-ejb/target/
+/module-web/target/
\ No newline at end of file
diff --git a/_gitignore b/_gitignore
new file mode 100644
index 0000000..40ab3c7
--- /dev/null
+++ b/_gitignore
@@ -0,0 +1,50 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+.classpath
+.project
+.settings
+~*
+*.idea
+*.iml
+MANIFEST.MF
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Directory #
+#############
+bin/
+out/
+target/
+.vscode/launch.json
diff --git a/module-ejb/pom.xml b/module-ejb/pom.xml
index 712c355..5977e5f 100644
--- a/module-ejb/pom.xml
+++ b/module-ejb/pom.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <artifactId>app</artifactId>
-      <groupId>pl.myboardgames</groupId>
-      <version>1.0-SNAPSHOT</version>
-   </parent>
-
-   <artifactId>module-ejb</artifactId>
-   <packaging>ejb</packaging>
-
-   <dependencies>
-      <dependency>
-         <groupId>javax</groupId>
-         <artifactId>javaee-api</artifactId>
-      </dependency>
-   </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <artifactId>app</artifactId>
+      <groupId>pl.myboardgames</groupId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>module-ejb</artifactId>
+   <packaging>ejb</packaging>
+
+   <dependencies>
+      <dependency>
+         <groupId>javax</groupId>
+         <artifactId>javaee-api</artifactId>
+      </dependency>
+   </dependencies>
+</project>
diff --git a/module-ejb/src/main/java/pl/myboardgames/boardgame/BoardGameDao.java b/module-ejb/src/main/java/pl/myboardgames/boardgame/db/BoardGameDao.java
similarity index 91%
rename from module-ejb/src/main/java/pl/myboardgames/boardgame/BoardGameDao.java
rename to module-ejb/src/main/java/pl/myboardgames/boardgame/db/BoardGameDao.java
index c913a88..8c24ee9 100644
--- a/module-ejb/src/main/java/pl/myboardgames/boardgame/BoardGameDao.java
+++ b/module-ejb/src/main/java/pl/myboardgames/boardgame/db/BoardGameDao.java
@@ -1,4 +1,4 @@
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.db;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -8,6 +8,8 @@ import javax.persistence.EntityNotFoundException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
+import pl.myboardgames.boardgame.model.BoardGameEntity;
+
 @Stateless
 public class BoardGameDao {
 
diff --git a/module-ejb/src/main/java/pl/myboardgames/boardgame/BoardGameEntity.java b/module-ejb/src/main/java/pl/myboardgames/boardgame/model/BoardGameEntity.java
similarity index 96%
rename from module-ejb/src/main/java/pl/myboardgames/boardgame/BoardGameEntity.java
rename to module-ejb/src/main/java/pl/myboardgames/boardgame/model/BoardGameEntity.java
index 0a770cb..4618b2d 100644
--- a/module-ejb/src/main/java/pl/myboardgames/boardgame/BoardGameEntity.java
+++ b/module-ejb/src/main/java/pl/myboardgames/boardgame/model/BoardGameEntity.java
@@ -1,4 +1,4 @@
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.model;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -13,7 +13,7 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
-import pl.myboardgames.user.UserEntity;
+import pl.myboardgames.user.model.UserEntity;
 
 @Entity
 @Table(name = "boardgames")
diff --git a/module-ejb/src/main/java/pl/myboardgames/user/UserDao.java b/module-ejb/src/main/java/pl/myboardgames/user/db/UserDao.java
similarity index 91%
rename from module-ejb/src/main/java/pl/myboardgames/user/UserDao.java
rename to module-ejb/src/main/java/pl/myboardgames/user/db/UserDao.java
index 6a4da2a..ac94c9f 100644
--- a/module-ejb/src/main/java/pl/myboardgames/user/UserDao.java
+++ b/module-ejb/src/main/java/pl/myboardgames/user/db/UserDao.java
@@ -1,7 +1,6 @@
-package pl.myboardgames.user;
+package pl.myboardgames.user.db;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
@@ -9,7 +8,8 @@ import javax.persistence.EntityNotFoundException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import pl.myboardgames.boardgame.BoardGameEntity;
+import pl.myboardgames.boardgame.model.BoardGameEntity;
+import pl.myboardgames.user.model.UserEntity;
 
 @Stateless
 public class UserDao {
diff --git a/module-ejb/src/main/java/pl/myboardgames/user/UserEntity.java b/module-ejb/src/main/java/pl/myboardgames/user/model/UserEntity.java
similarity index 91%
rename from module-ejb/src/main/java/pl/myboardgames/user/UserEntity.java
rename to module-ejb/src/main/java/pl/myboardgames/user/model/UserEntity.java
index 445589a..889725b 100644
--- a/module-ejb/src/main/java/pl/myboardgames/user/UserEntity.java
+++ b/module-ejb/src/main/java/pl/myboardgames/user/model/UserEntity.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user;
+package pl.myboardgames.user.model;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -15,7 +15,7 @@ import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
-import pl.myboardgames.boardgame.BoardGameEntity;
+import pl.myboardgames.boardgame.model.BoardGameEntity;
 
 /**
  *
diff --git a/module-web/nb-configuration.xml b/module-web/nb-configuration.xml
index 4da1f6c..9339e89 100644
--- a/module-web/nb-configuration.xml
+++ b/module-web/nb-configuration.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
     <!--
 This file contains additional configuration written by modules in the NetBeans IDE.
 The configuration is intended to be shared among all the users of project and
 therefore it is assumed to be part of version control checkout.
 Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+-->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
         <!--
 Properties that influence various parts of the IDE, especially code formatting and the like. 
 You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
-    </properties>
-</project-shared-configuration>
+-->
+        <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
+    </properties>
+</project-shared-configuration>
diff --git a/module-web/pom.xml b/module-web/pom.xml
index 2269cdb..8917044 100644
--- a/module-web/pom.xml
+++ b/module-web/pom.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <artifactId>app</artifactId>
-      <groupId>pl.myboardgames</groupId>
-      <version>1.0-SNAPSHOT</version>
-   </parent>
-   <artifactId>module-web</artifactId>
-   <packaging>war</packaging>
-   <name>module-web</name>
-
-   <dependencies>
-      <dependency>
-         <groupId>pl.myboardgames</groupId>
-         <artifactId>module-ejb</artifactId>
-         <type>ejb</type>
-         <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>javax</groupId>
-         <artifactId>javaee-api</artifactId>
-      </dependency>
-   </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <artifactId>app</artifactId>
+      <groupId>pl.myboardgames</groupId>
+      <version>1.0-SNAPSHOT</version>
+   </parent>
+   <artifactId>module-web</artifactId>
+   <packaging>war</packaging>
+   <name>module-web</name>
+
+   <dependencies>
+      <dependency>
+         <groupId>pl.myboardgames</groupId>
+         <artifactId>module-ejb</artifactId>
+         <type>ejb</type>
+         <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>javax</groupId>
+         <artifactId>javaee-api</artifactId>
+      </dependency>
+   </dependencies>
+</project>
diff --git a/module-web/src/main/java/pl/myboardgames/JaxRsActivator.java b/module-web/src/main/java/pl/myboardgames/JaxRsActivator.java
index 5004261..0a43a7f 100644
--- a/module-web/src/main/java/pl/myboardgames/JaxRsActivator.java
+++ b/module-web/src/main/java/pl/myboardgames/JaxRsActivator.java
@@ -1,18 +1,18 @@
-package pl.myboardgames;
-
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
-
-/**
- * A class extending {@link Application} and annotated with @ApplicationPath is the Java EE 6
- * "no XML" approach to activating JAX-RS.
- * 
- * <p>
- * Resources are served relative to the servlet path specified in the {@link ApplicationPath}
- * annotation.
- * </p>
- */
-@ApplicationPath("/api/v1")
-public class JaxRsActivator extends Application {
-   /* class body intentionally left blank */
-}
+package pl.myboardgames;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+/**
+ * A class extending {@link Application} and annotated with @ApplicationPath is the Java EE 6
+ * "no XML" approach to activating JAX-RS.
+ * 
+ * <p>
+ * Resources are served relative to the servlet path specified in the {@link ApplicationPath}
+ * annotation.
+ * </p>
+ */
+@ApplicationPath("/api/v1")
+public class JaxRsActivator extends Application {
+   /* class body intentionally left blank */
+}
diff --git a/module-web/src/main/java/pl/myboardgames/boardgame/BoardGameDto.java b/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameDto.java
similarity index 88%
rename from module-web/src/main/java/pl/myboardgames/boardgame/BoardGameDto.java
rename to module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameDto.java
index 2167354..0aff455 100644
--- a/module-web/src/main/java/pl/myboardgames/boardgame/BoardGameDto.java
+++ b/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameDto.java
@@ -3,12 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.dto;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-import pl.myboardgames.user.UserShortDto;
+
+import pl.myboardgames.boardgame.model.BoardGameEntity;
+import pl.myboardgames.user.dto.UserShortDto;
 
 
 /**
diff --git a/module-web/src/main/java/pl/myboardgames/boardgame/BoardGameMapper.java b/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameMapper.java
similarity index 84%
rename from module-web/src/main/java/pl/myboardgames/boardgame/BoardGameMapper.java
rename to module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameMapper.java
index f67336a..ce0053a 100644
--- a/module-web/src/main/java/pl/myboardgames/boardgame/BoardGameMapper.java
+++ b/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameMapper.java
@@ -3,13 +3,15 @@
  * To change ret template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.dto;
+
+import pl.myboardgames.boardgame.model.BoardGameEntity;
 
 /**
  *
  * @author Nao
  */
-class BoardGameMapper {
+public class BoardGameMapper {
 
     public BoardGameMapper() {
     }
diff --git a/module-web/src/main/java/pl/myboardgames/boardgame/BoardGameShortDto.java b/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameShortDto.java
similarity index 83%
rename from module-web/src/main/java/pl/myboardgames/boardgame/BoardGameShortDto.java
rename to module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameShortDto.java
index dadb6a0..52fa5a1 100644
--- a/module-web/src/main/java/pl/myboardgames/boardgame/BoardGameShortDto.java
+++ b/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameShortDto.java
@@ -3,7 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.dto;
+
+import pl.myboardgames.boardgame.model.BoardGameEntity;
 
 /**
  *
diff --git a/module-web/src/main/java/pl/myboardgames/boardgame/BoardGameController.java b/module-web/src/main/java/pl/myboardgames/boardgame/resources/BoardGameResource.java
similarity index 85%
rename from module-web/src/main/java/pl/myboardgames/boardgame/BoardGameController.java
rename to module-web/src/main/java/pl/myboardgames/boardgame/resources/BoardGameResource.java
index 619079d..6048c32 100644
--- a/module-web/src/main/java/pl/myboardgames/boardgame/BoardGameController.java
+++ b/module-web/src/main/java/pl/myboardgames/boardgame/resources/BoardGameResource.java
@@ -1,4 +1,4 @@
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.resources;
 
 import java.util.stream.Collectors;
 import javax.ejb.EJB;
@@ -13,9 +13,15 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 
+import pl.myboardgames.boardgame.db.BoardGameDao;
+import pl.myboardgames.boardgame.dto.BoardGameDto;
+import pl.myboardgames.boardgame.dto.BoardGameMapper;
+import pl.myboardgames.boardgame.dto.BoardGameShortDto;
+import pl.myboardgames.boardgame.model.BoardGameEntity;
+
 @Path("/boardgame")
 @RequestScoped
-public class BoardGameController {
+public class BoardGameResource {
 
     @EJB
     BoardGameDao boardGameDatabase;
diff --git a/module-web/src/main/java/pl/myboardgames/user/UserDto.java b/module-web/src/main/java/pl/myboardgames/user/dto/UserDto.java
similarity index 88%
rename from module-web/src/main/java/pl/myboardgames/user/UserDto.java
rename to module-web/src/main/java/pl/myboardgames/user/dto/UserDto.java
index c1c61cf..ad73f18 100644
--- a/module-web/src/main/java/pl/myboardgames/user/UserDto.java
+++ b/module-web/src/main/java/pl/myboardgames/user/dto/UserDto.java
@@ -3,13 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user;
+package pl.myboardgames.user.dto;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import pl.myboardgames.boardgame.BoardGameShortDto;
+import pl.myboardgames.boardgame.dto.BoardGameShortDto;
+import pl.myboardgames.user.model.UserEntity;
 
 /**
  *
diff --git a/module-web/src/main/java/pl/myboardgames/user/UserMapper.java b/module-web/src/main/java/pl/myboardgames/user/dto/UserMapper.java
similarity index 83%
rename from module-web/src/main/java/pl/myboardgames/user/UserMapper.java
rename to module-web/src/main/java/pl/myboardgames/user/dto/UserMapper.java
index 83ba82a..42b170d 100644
--- a/module-web/src/main/java/pl/myboardgames/user/UserMapper.java
+++ b/module-web/src/main/java/pl/myboardgames/user/dto/UserMapper.java
@@ -3,13 +3,15 @@
  * To change ret template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user;
+package pl.myboardgames.user.dto;
+
+import pl.myboardgames.user.model.UserEntity;
 
 /**
  *
  * @author Nao
  */
-class UserMapper {
+public class UserMapper {
 
     public UserMapper() {
     }
diff --git a/module-web/src/main/java/pl/myboardgames/user/UserShortDto.java b/module-web/src/main/java/pl/myboardgames/user/dto/UserShortDto.java
similarity index 89%
rename from module-web/src/main/java/pl/myboardgames/user/UserShortDto.java
rename to module-web/src/main/java/pl/myboardgames/user/dto/UserShortDto.java
index 3f6aaf6..6e92479 100644
--- a/module-web/src/main/java/pl/myboardgames/user/UserShortDto.java
+++ b/module-web/src/main/java/pl/myboardgames/user/dto/UserShortDto.java
@@ -3,7 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user;
+package pl.myboardgames.user.dto;
+
+import pl.myboardgames.user.model.UserEntity;
 
 /**
  *
diff --git a/module-web/src/main/java/pl/myboardgames/user/UserController.java b/module-web/src/main/java/pl/myboardgames/user/resources/UserResource.java
similarity index 87%
rename from module-web/src/main/java/pl/myboardgames/user/UserController.java
rename to module-web/src/main/java/pl/myboardgames/user/resources/UserResource.java
index 1cf0602..b4008ee 100644
--- a/module-web/src/main/java/pl/myboardgames/user/UserController.java
+++ b/module-web/src/main/java/pl/myboardgames/user/resources/UserResource.java
@@ -1,4 +1,4 @@
-package pl.myboardgames.user;
+package pl.myboardgames.user.resources;
 
 import java.util.stream.Collectors;
 import javax.ejb.EJB;
@@ -12,11 +12,17 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
-import pl.myboardgames.boardgame.BoardGameShortDto;
+
+import pl.myboardgames.boardgame.dto.BoardGameShortDto;
+import pl.myboardgames.user.db.UserDao;
+import pl.myboardgames.user.dto.UserDto;
+import pl.myboardgames.user.dto.UserMapper;
+import pl.myboardgames.user.dto.UserShortDto;
+import pl.myboardgames.user.model.UserEntity;
 
 @Path("/user")
 @RequestScoped
-public class UserController {
+public class UserResource {
 
    @EJB
    UserDao userDatabase;