diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcd4416a7..58df46dad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -231,8 +231,6 @@ endif()
 option(WITH_CLIENT "build cockatrice" ON)
 if(WITH_CLIENT)
     add_subdirectory(cockatrice)
-    add_subdirectory(sounds)
-    add_subdirectory(themes)
     SET(CPACK_INSTALL_CMAKE_PROJECTS "cockatrice;cockatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
 endif()
 
diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 03573cc67..959523746 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -113,6 +113,9 @@ SET(cockatrice_SOURCES
     ${VERSION_STRING_CPP}
 )
 
+add_subdirectory(sounds)
+add_subdirectory(themes)
+
 set(cockatrice_RESOURCES cockatrice.qrc)
 
 IF(UPDATE_TRANSLATIONS)
diff --git a/sounds/CMakeLists.txt b/cockatrice/sounds/CMakeLists.txt
similarity index 100%
rename from sounds/CMakeLists.txt
rename to cockatrice/sounds/CMakeLists.txt
diff --git a/sounds/Default/attack_step.wav b/cockatrice/sounds/Default/attack_step.wav
similarity index 100%
rename from sounds/Default/attack_step.wav
rename to cockatrice/sounds/Default/attack_step.wav
diff --git a/sounds/Default/buddy_join.wav b/cockatrice/sounds/Default/buddy_join.wav
similarity index 100%
rename from sounds/Default/buddy_join.wav
rename to cockatrice/sounds/Default/buddy_join.wav
diff --git a/sounds/Default/buddy_leave.wav b/cockatrice/sounds/Default/buddy_leave.wav
similarity index 100%
rename from sounds/Default/buddy_leave.wav
rename to cockatrice/sounds/Default/buddy_leave.wav
diff --git a/sounds/Default/end_step.wav b/cockatrice/sounds/Default/end_step.wav
similarity index 100%
rename from sounds/Default/end_step.wav
rename to cockatrice/sounds/Default/end_step.wav
diff --git a/sounds/Default/player_join.wav b/cockatrice/sounds/Default/player_join.wav
similarity index 100%
rename from sounds/Default/player_join.wav
rename to cockatrice/sounds/Default/player_join.wav
diff --git a/sounds/Default/start_combat.wav b/cockatrice/sounds/Default/start_combat.wav
similarity index 100%
rename from sounds/Default/start_combat.wav
rename to cockatrice/sounds/Default/start_combat.wav
diff --git a/sounds/Default/tap_card.wav b/cockatrice/sounds/Default/tap_card.wav
similarity index 100%
rename from sounds/Default/tap_card.wav
rename to cockatrice/sounds/Default/tap_card.wav
diff --git a/sounds/Legacy/all_mention.wav b/cockatrice/sounds/Legacy/all_mention.wav
similarity index 100%
rename from sounds/Legacy/all_mention.wav
rename to cockatrice/sounds/Legacy/all_mention.wav
diff --git a/sounds/Legacy/chat_mention.wav b/cockatrice/sounds/Legacy/chat_mention.wav
similarity index 100%
rename from sounds/Legacy/chat_mention.wav
rename to cockatrice/sounds/Legacy/chat_mention.wav
diff --git a/sounds/Legacy/draw_step.wav b/cockatrice/sounds/Legacy/draw_step.wav
similarity index 100%
rename from sounds/Legacy/draw_step.wav
rename to cockatrice/sounds/Legacy/draw_step.wav
diff --git a/sounds/Legacy/play_card.wav b/cockatrice/sounds/Legacy/play_card.wav
similarity index 100%
rename from sounds/Legacy/play_card.wav
rename to cockatrice/sounds/Legacy/play_card.wav
diff --git a/sounds/Legacy/player_join.wav b/cockatrice/sounds/Legacy/player_join.wav
similarity index 100%
rename from sounds/Legacy/player_join.wav
rename to cockatrice/sounds/Legacy/player_join.wav
diff --git a/sounds/Legacy/private_message.wav b/cockatrice/sounds/Legacy/private_message.wav
similarity index 100%
rename from sounds/Legacy/private_message.wav
rename to cockatrice/sounds/Legacy/private_message.wav
diff --git a/sounds/Legacy/shuffle.wav b/cockatrice/sounds/Legacy/shuffle.wav
similarity index 100%
rename from sounds/Legacy/shuffle.wav
rename to cockatrice/sounds/Legacy/shuffle.wav
diff --git a/sounds/Legacy/tap_card.wav b/cockatrice/sounds/Legacy/tap_card.wav
similarity index 100%
rename from sounds/Legacy/tap_card.wav
rename to cockatrice/sounds/Legacy/tap_card.wav
diff --git a/sounds/Legacy/untap_card.wav b/cockatrice/sounds/Legacy/untap_card.wav
similarity index 100%
rename from sounds/Legacy/untap_card.wav
rename to cockatrice/sounds/Legacy/untap_card.wav
diff --git a/themes/CMakeLists.txt b/cockatrice/themes/CMakeLists.txt
similarity index 100%
rename from themes/CMakeLists.txt
rename to cockatrice/themes/CMakeLists.txt
diff --git a/themes/Default/.gitignore b/cockatrice/themes/Default/.gitignore
similarity index 100%
rename from themes/Default/.gitignore
rename to cockatrice/themes/Default/.gitignore
diff --git a/themes/Fabric/zones/handzone.png b/cockatrice/themes/Fabric/zones/handzone.png
similarity index 100%
rename from themes/Fabric/zones/handzone.png
rename to cockatrice/themes/Fabric/zones/handzone.png
diff --git a/themes/Fabric/zones/playerzone.png b/cockatrice/themes/Fabric/zones/playerzone.png
similarity index 100%
rename from themes/Fabric/zones/playerzone.png
rename to cockatrice/themes/Fabric/zones/playerzone.png
diff --git a/themes/Fabric/zones/stackzone.png b/cockatrice/themes/Fabric/zones/stackzone.png
similarity index 100%
rename from themes/Fabric/zones/stackzone.png
rename to cockatrice/themes/Fabric/zones/stackzone.png
diff --git a/themes/Fabric/zones/tablezone.png b/cockatrice/themes/Fabric/zones/tablezone.png
similarity index 100%
rename from themes/Fabric/zones/tablezone.png
rename to cockatrice/themes/Fabric/zones/tablezone.png
diff --git a/themes/Leather/zones/handzone.png b/cockatrice/themes/Leather/zones/handzone.png
similarity index 100%
rename from themes/Leather/zones/handzone.png
rename to cockatrice/themes/Leather/zones/handzone.png
diff --git a/themes/Leather/zones/playerzone.png b/cockatrice/themes/Leather/zones/playerzone.png
similarity index 100%
rename from themes/Leather/zones/playerzone.png
rename to cockatrice/themes/Leather/zones/playerzone.png
diff --git a/themes/Leather/zones/stackzone.png b/cockatrice/themes/Leather/zones/stackzone.png
similarity index 100%
rename from themes/Leather/zones/stackzone.png
rename to cockatrice/themes/Leather/zones/stackzone.png
diff --git a/themes/Leather/zones/tablezone.png b/cockatrice/themes/Leather/zones/tablezone.png
similarity index 100%
rename from themes/Leather/zones/tablezone.png
rename to cockatrice/themes/Leather/zones/tablezone.png
diff --git a/themes/Plasma/zones/handzone.png b/cockatrice/themes/Plasma/zones/handzone.png
similarity index 100%
rename from themes/Plasma/zones/handzone.png
rename to cockatrice/themes/Plasma/zones/handzone.png
diff --git a/themes/Plasma/zones/playerzone.png b/cockatrice/themes/Plasma/zones/playerzone.png
similarity index 100%
rename from themes/Plasma/zones/playerzone.png
rename to cockatrice/themes/Plasma/zones/playerzone.png
diff --git a/themes/Plasma/zones/stackzone.png b/cockatrice/themes/Plasma/zones/stackzone.png
similarity index 100%
rename from themes/Plasma/zones/stackzone.png
rename to cockatrice/themes/Plasma/zones/stackzone.png
diff --git a/themes/Plasma/zones/tablezone.png b/cockatrice/themes/Plasma/zones/tablezone.png
similarity index 100%
rename from themes/Plasma/zones/tablezone.png
rename to cockatrice/themes/Plasma/zones/tablezone.png
diff --git a/themes/VelvetMarble/zones/handzone.jpg b/cockatrice/themes/VelvetMarble/zones/handzone.jpg
similarity index 100%
rename from themes/VelvetMarble/zones/handzone.jpg
rename to cockatrice/themes/VelvetMarble/zones/handzone.jpg
diff --git a/themes/VelvetMarble/zones/playerzone.jpg b/cockatrice/themes/VelvetMarble/zones/playerzone.jpg
similarity index 100%
rename from themes/VelvetMarble/zones/playerzone.jpg
rename to cockatrice/themes/VelvetMarble/zones/playerzone.jpg
diff --git a/themes/VelvetMarble/zones/stackzone.jpg b/cockatrice/themes/VelvetMarble/zones/stackzone.jpg
similarity index 100%
rename from themes/VelvetMarble/zones/stackzone.jpg
rename to cockatrice/themes/VelvetMarble/zones/stackzone.jpg
diff --git a/themes/VelvetMarble/zones/tablezone.jpg b/cockatrice/themes/VelvetMarble/zones/tablezone.jpg
similarity index 100%
rename from themes/VelvetMarble/zones/tablezone.jpg
rename to cockatrice/themes/VelvetMarble/zones/tablezone.jpg