diff --git a/be/.gitignore b/backend/.gitignore
similarity index 100%
rename from be/.gitignore
rename to backend/.gitignore
diff --git a/be/build.gradle b/backend/build.gradle
similarity index 100%
rename from be/build.gradle
rename to backend/build.gradle
diff --git a/be/gradle.properties b/backend/gradle.properties
similarity index 100%
rename from be/gradle.properties
rename to backend/gradle.properties
diff --git a/be/gradle/wrapper/gradle-wrapper.jar b/backend/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from be/gradle/wrapper/gradle-wrapper.jar
rename to backend/gradle/wrapper/gradle-wrapper.jar
diff --git a/be/gradle/wrapper/gradle-wrapper.properties b/backend/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from be/gradle/wrapper/gradle-wrapper.properties
rename to backend/gradle/wrapper/gradle-wrapper.properties
diff --git a/be/gradlew b/backend/gradlew
similarity index 100%
rename from be/gradlew
rename to backend/gradlew
diff --git a/be/gradlew.bat b/backend/gradlew.bat
similarity index 100%
rename from be/gradlew.bat
rename to backend/gradlew.bat
diff --git a/be/package-lock.json b/backend/package-lock.json
similarity index 100%
rename from be/package-lock.json
rename to backend/package-lock.json
diff --git a/be/requirements.txt b/backend/requirements.txt
similarity index 100%
rename from be/requirements.txt
rename to backend/requirements.txt
diff --git a/be/resources/application.conf b/backend/resources/application.conf
similarity index 100%
rename from be/resources/application.conf
rename to backend/resources/application.conf
diff --git a/be/resources/logback.xml b/backend/resources/logback.xml
similarity index 100%
rename from be/resources/logback.xml
rename to backend/resources/logback.xml
diff --git a/be/settings.gradle b/backend/settings.gradle
similarity index 100%
rename from be/settings.gradle
rename to backend/settings.gradle
diff --git a/be/src/cz/cvut/fel/veselj57/Application.kt b/backend/src/cz/cvut/fel/veselj57/Application.kt
similarity index 100%
rename from be/src/cz/cvut/fel/veselj57/Application.kt
rename to backend/src/cz/cvut/fel/veselj57/Application.kt
diff --git a/be/src/cz/cvut/fel/veselj57/DI.kt b/backend/src/cz/cvut/fel/veselj57/DI.kt
similarity index 100%
rename from be/src/cz/cvut/fel/veselj57/DI.kt
rename to backend/src/cz/cvut/fel/veselj57/DI.kt
diff --git a/be/src/cz/cvut/fel/veselj57/MemeGenerator.kt b/backend/src/cz/cvut/fel/veselj57/MemeGenerator.kt
similarity index 100%
rename from be/src/cz/cvut/fel/veselj57/MemeGenerator.kt
rename to backend/src/cz/cvut/fel/veselj57/MemeGenerator.kt
diff --git a/be/src/cz/cvut/fel/veselj57/api/RandomMemeAPI.kt b/backend/src/cz/cvut/fel/veselj57/api/RandomMemeAPI.kt
similarity index 100%
rename from be/src/cz/cvut/fel/veselj57/api/RandomMemeAPI.kt
rename to backend/src/cz/cvut/fel/veselj57/api/RandomMemeAPI.kt
diff --git a/be/src/cz/cvut/fel/veselj57/services/joke/Joke.kt b/backend/src/cz/cvut/fel/veselj57/services/joke/Joke.kt
similarity index 100%
rename from be/src/cz/cvut/fel/veselj57/services/joke/Joke.kt
rename to backend/src/cz/cvut/fel/veselj57/services/joke/Joke.kt
diff --git a/be/src/cz/cvut/fel/veselj57/services/joke/JokeAPI.kt b/backend/src/cz/cvut/fel/veselj57/services/joke/JokeAPI.kt
similarity index 100%
rename from be/src/cz/cvut/fel/veselj57/services/joke/JokeAPI.kt
rename to backend/src/cz/cvut/fel/veselj57/services/joke/JokeAPI.kt
diff --git a/be/src/cz/cvut/fel/veselj57/services/joke/JokeTopic.kt b/backend/src/cz/cvut/fel/veselj57/services/joke/JokeTopic.kt
similarity index 100%
rename from be/src/cz/cvut/fel/veselj57/services/joke/JokeTopic.kt
rename to backend/src/cz/cvut/fel/veselj57/services/joke/JokeTopic.kt
diff --git a/be/src/cz/cvut/fel/veselj57/services/joke/JokeType.kt b/backend/src/cz/cvut/fel/veselj57/services/joke/JokeType.kt
similarity index 100%
rename from be/src/cz/cvut/fel/veselj57/services/joke/JokeType.kt
rename to backend/src/cz/cvut/fel/veselj57/services/joke/JokeType.kt
diff --git a/be/src/cz/cvut/fel/veselj57/services/meme_generator/MemeGeneratorAPI.kt b/backend/src/cz/cvut/fel/veselj57/services/meme_generator/MemeGeneratorAPI.kt
similarity index 100%
rename from be/src/cz/cvut/fel/veselj57/services/meme_generator/MemeGeneratorAPI.kt
rename to backend/src/cz/cvut/fel/veselj57/services/meme_generator/MemeGeneratorAPI.kt
diff --git a/be/test/ApplicationTest.kt b/backend/test/ApplicationTest.kt
similarity index 100%
rename from be/test/ApplicationTest.kt
rename to backend/test/ApplicationTest.kt
diff --git a/fe b/fe
deleted file mode 160000
index db972122753ca40a4e958d1f7e5be78927f36e00..0000000000000000000000000000000000000000
--- a/fe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit db972122753ca40a4e958d1f7e5be78927f36e00