diff --git a/.gitignore b/.gitignore
index 918c7455d69f3b9692fe3549166eb6b34ad3b28d..c2065bc26202b2d072aca3efc3d1c2efad3afcbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,37 @@
-.idea/
-.gradle/
-gradle/
-build/
\ No newline at end of file
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
diff --git a/README.md b/README.md
index 55cba45878d8aada8845333e73714a89a43663bd..b31c3a7ba14398805fd997aaa62085997c24dd9e 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,45 @@
-# TJV Semestralka
-
-- Repozitář pro semestrální práci z předmětu BI-TJV.
+# Semestrální práce 
 
 - Tematem semestrální práce bude herní portál, který spravuje servery na kterém hrajou hráči.
-    - Aplikace eviduje kdy se na jaký server hráč připojil 
-    - Aplikace eviduje seznam hráčů, kteří hráli na jakémkoliv serveru
-    - Aplikace bude podporovat základní filtrování
-        - Pro hráče:
-            - Podle země z které se pocházejí
-            - Podle jména
-            - Podle času strávený na všech serverech
-        - Pro server:
-            - Podle jména
-            - Podle zemÄ›
-            - Podle poÄŤtu hracĂ­ch slotĹŻ
+- Aplikace eviduje kdy se na jaký server hráč připojil
+- Aplikace eviduje seznam hráčů, kteří hráli na jakémkoliv serveru
 
 ## Data Structure
 
-- `domaciUkol01` domácí úkol, který nám byl zadán na cvičení
-- `semestralka` semestrální práce pro zimní semestr 2020
\ No newline at end of file
+- `controller`
+    - `PlayerController`
+    - `ServerController`
+- `dto`
+    - `PlayerCreateDTO`
+    - `PlayerDTO`
+    - `ServerCreateDTO`
+    - `ServerDTO`
+- `entity`
+    - `Player`
+    - `Server`
+- `repository`
+    - `PlayerRepository`
+    - `ServerRepository`
+- `service`
+    - `PlayerService`
+    - `ServerService`
+
+
+## Database Structure
+![Obrázek schématu databáze](https://ctrlv.cz/shots/2020/11/19/nZwS.png)
+
+## Requests
+- requests supports JSON format only 
+### GET 
+- `/server/all` - print all servers
+- `/server/{id}` - print server with given id
+- `/player/all` - print all players
+- `/player/{id}` - print player with given id
+
+### POST
+- `/server` - add server
+- `/player` - add player
+
+### PUT
+- `/server/{id}` - updates server
+- `/player/{id}` - updates player
\ No newline at end of file
diff --git a/semestralka/build.gradle b/build.gradle
similarity index 100%
rename from semestralka/build.gradle
rename to build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000000000000000000000000000000000..12d38de6a487379bb3664c6ac06e21443d977e2e
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/semestralka/gradlew b/gradlew
similarity index 100%
rename from semestralka/gradlew
rename to gradlew
diff --git a/semestralka/gradlew.bat b/gradlew.bat
similarity index 100%
rename from semestralka/gradlew.bat
rename to gradlew.bat
diff --git a/semestralka/.gitignore b/semestralka/.gitignore
deleted file mode 100644
index c2065bc26202b2d072aca3efc3d1c2efad3afcbf..0000000000000000000000000000000000000000
--- a/semestralka/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-HELP.md
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
diff --git a/semestralka/README.md b/semestralka/README.md
deleted file mode 100644
index b31c3a7ba14398805fd997aaa62085997c24dd9e..0000000000000000000000000000000000000000
--- a/semestralka/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Semestrální práce 
-
-- Tematem semestrální práce bude herní portál, který spravuje servery na kterém hrajou hráči.
-- Aplikace eviduje kdy se na jaký server hráč připojil
-- Aplikace eviduje seznam hráčů, kteří hráli na jakémkoliv serveru
-
-## Data Structure
-
-- `controller`
-    - `PlayerController`
-    - `ServerController`
-- `dto`
-    - `PlayerCreateDTO`
-    - `PlayerDTO`
-    - `ServerCreateDTO`
-    - `ServerDTO`
-- `entity`
-    - `Player`
-    - `Server`
-- `repository`
-    - `PlayerRepository`
-    - `ServerRepository`
-- `service`
-    - `PlayerService`
-    - `ServerService`
-
-
-## Database Structure
-![Obrázek schématu databáze](https://ctrlv.cz/shots/2020/11/19/nZwS.png)
-
-## Requests
-- requests supports JSON format only 
-### GET 
-- `/server/all` - print all servers
-- `/server/{id}` - print server with given id
-- `/player/all` - print all players
-- `/player/{id}` - print player with given id
-
-### POST
-- `/server` - add server
-- `/player` - add player
-
-### PUT
-- `/server/{id}` - updates server
-- `/player/{id}` - updates player
\ No newline at end of file
diff --git a/semestralka/settings.gradle b/settings.gradle
similarity index 100%
rename from semestralka/settings.gradle
rename to settings.gradle
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/SemestralkaApplication.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/SemestralkaApplication.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/SemestralkaApplication.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/SemestralkaApplication.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/PlayerController.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/PlayerController.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/PlayerController.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/PlayerController.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/ServerController.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/ServerController.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/ServerController.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/ServerController.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/PlayerCreateDTO.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/PlayerCreateDTO.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/PlayerCreateDTO.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/PlayerCreateDTO.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/PlayerDTO.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/PlayerDTO.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/PlayerDTO.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/PlayerDTO.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/ServerCreateDTO.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/ServerCreateDTO.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/ServerCreateDTO.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/ServerCreateDTO.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/ServerDTO.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/ServerDTO.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/ServerDTO.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/dto/ServerDTO.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/entity/Player.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/entity/Player.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/entity/Player.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/entity/Player.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/entity/Server.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/entity/Server.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/entity/Server.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/entity/Server.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/repozitory/PlayerRepository.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/repozitory/PlayerRepository.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/repozitory/PlayerRepository.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/repozitory/PlayerRepository.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/repozitory/ServerRepository.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/repozitory/ServerRepository.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/repozitory/ServerRepository.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/repozitory/ServerRepository.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/service/PlayerService.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/service/PlayerService.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/service/PlayerService.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/service/PlayerService.java
diff --git a/semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/service/ServerService.java b/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/service/ServerService.java
similarity index 100%
rename from semestralka/src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/service/ServerService.java
rename to src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/service/ServerService.java
diff --git a/semestralka/src/main/resources/application.properties b/src/main/resources/application.properties
similarity index 100%
rename from semestralka/src/main/resources/application.properties
rename to src/main/resources/application.properties
diff --git a/semestralka/src/test/httpTests.http b/src/test/httpTests.http
similarity index 100%
rename from semestralka/src/test/httpTests.http
rename to src/test/httpTests.http
diff --git a/src/test/java/cz/cvut/fit/tjv/seidlpet/semestralka/PlayerTest.java b/src/test/java/cz/cvut/fit/tjv/seidlpet/semestralka/PlayerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a5ff59328db5c95b2d527b5e4dcd0a1692e73c66
--- /dev/null
+++ b/src/test/java/cz/cvut/fit/tjv/seidlpet/semestralka/PlayerTest.java
@@ -0,0 +1,26 @@
+package cz.cvut.fit.tjv.seidlpet.semestralka;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+public class PlayerTest {
+
+    @Autowired
+    private MockMvc mvc;
+
+    public void getPlayerById(int id) throws Exception {
+        mvc.perform(MockMvcRequestBuilders.get("/player/" + id)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(MockMvcResultMatchers.status().isOk())
+                .andExpect(MockMvcResultMatchers.content().string(
+                   ""
+                ));
+    }
+}
diff --git a/semestralka/src/test/java/cz/cvut/fit/tjv/seidlpet/semestralka/SemestralkaApplicationTests.java b/src/test/java/cz/cvut/fit/tjv/seidlpet/semestralka/SemestralkaApplicationTests.java
similarity index 100%
rename from semestralka/src/test/java/cz/cvut/fit/tjv/seidlpet/semestralka/SemestralkaApplicationTests.java
rename to src/test/java/cz/cvut/fit/tjv/seidlpet/semestralka/SemestralkaApplicationTests.java