diff --git a/pocket_friends/game_files/resources/images/icon/icon.ico b/pocket_friends/game_files/icon/icon.ico
similarity index 100%
rename from pocket_friends/game_files/resources/images/icon/icon.ico
rename to pocket_friends/game_files/icon/icon.ico
diff --git a/pocket_friends/game_files/resources/images/icon/icon.png b/pocket_friends/game_files/icon/icon.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/icon/icon.png
rename to pocket_friends/game_files/icon/icon.png
diff --git a/pocket_friends/game_files/resources/data/bloop_info/blue.json b/pocket_friends/game_files/surfaces/resources/data/bloop_info/blue.json
similarity index 100%
rename from pocket_friends/game_files/resources/data/bloop_info/blue.json
rename to pocket_friends/game_files/surfaces/resources/data/bloop_info/blue.json
diff --git a/pocket_friends/game_files/resources/data/bloop_info/dev_egg.json b/pocket_friends/game_files/surfaces/resources/data/bloop_info/dev_egg.json
similarity index 100%
rename from pocket_friends/game_files/resources/data/bloop_info/dev_egg.json
rename to pocket_friends/game_files/surfaces/resources/data/bloop_info/dev_egg.json
diff --git a/pocket_friends/game_files/resources/data/bloop_info/rainbow.json b/pocket_friends/game_files/surfaces/resources/data/bloop_info/rainbow.json
similarity index 100%
rename from pocket_friends/game_files/resources/data/bloop_info/rainbow.json
rename to pocket_friends/game_files/surfaces/resources/data/bloop_info/rainbow.json
diff --git a/pocket_friends/game_files/resources/data/bloop_info/red.json b/pocket_friends/game_files/surfaces/resources/data/bloop_info/red.json
similarity index 100%
rename from pocket_friends/game_files/resources/data/bloop_info/red.json
rename to pocket_friends/game_files/surfaces/resources/data/bloop_info/red.json
diff --git a/pocket_friends/game_files/resources/fonts/5Pts5.ttf b/pocket_friends/game_files/surfaces/resources/fonts/5Pts5.ttf
similarity index 100%
rename from pocket_friends/game_files/resources/fonts/5Pts5.ttf
rename to pocket_friends/game_files/surfaces/resources/fonts/5Pts5.ttf
diff --git a/pocket_friends/game_files/resources/images/bg.png b/pocket_friends/game_files/surfaces/resources/images/bg.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bg.png
rename to pocket_friends/game_files/surfaces/resources/images/bg.png
diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/green/green.png b/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/green/green.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/_postponed/green/green.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/green/green.png
diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/indigo/indigo.png b/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/indigo/indigo.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/_postponed/indigo/indigo.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/indigo/indigo.png
diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/orange/orange.png b/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/orange/orange.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/_postponed/orange/orange.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/orange/orange.png
diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/violet/violet.png b/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/violet/violet.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/_postponed/violet/violet.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/violet/violet.png
diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/white/white.png b/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/white/white.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/_postponed/white/white.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/white/white.png
diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/yellow/yellow.png b/pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/yellow/yellow.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/_postponed/yellow/yellow.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/_postponed/yellow/yellow.png
diff --git a/pocket_friends/game_files/resources/images/bloops/blue/egg.json b/pocket_friends/game_files/surfaces/resources/images/bloops/blue/egg.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/blue/egg.json
rename to pocket_friends/game_files/surfaces/resources/images/bloops/blue/egg.json
diff --git a/pocket_friends/game_files/resources/images/bloops/blue/egg.png b/pocket_friends/game_files/surfaces/resources/images/bloops/blue/egg.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/blue/egg.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/blue/egg.png
diff --git a/pocket_friends/game_files/resources/images/bloops/dev_egg/baby.json b/pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/baby.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/dev_egg/baby.json
rename to pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/baby.json
diff --git a/pocket_friends/game_files/resources/images/bloops/dev_egg/baby.png b/pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/baby.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/dev_egg/baby.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/baby.png
diff --git a/pocket_friends/game_files/resources/images/bloops/dev_egg/egg.json b/pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/egg.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/dev_egg/egg.json
rename to pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/egg.json
diff --git a/pocket_friends/game_files/resources/images/bloops/dev_egg/egg.png b/pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/egg.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/dev_egg/egg.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/egg.png
diff --git a/pocket_friends/game_files/resources/images/bloops/rainbow/egg.json b/pocket_friends/game_files/surfaces/resources/images/bloops/rainbow/egg.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/rainbow/egg.json
rename to pocket_friends/game_files/surfaces/resources/images/bloops/rainbow/egg.json
diff --git a/pocket_friends/game_files/resources/images/bloops/rainbow/egg.png b/pocket_friends/game_files/surfaces/resources/images/bloops/rainbow/egg.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/rainbow/egg.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/rainbow/egg.png
diff --git a/pocket_friends/game_files/resources/images/bloops/red/egg.json b/pocket_friends/game_files/surfaces/resources/images/bloops/red/egg.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/red/egg.json
rename to pocket_friends/game_files/surfaces/resources/images/bloops/red/egg.json
diff --git a/pocket_friends/game_files/resources/images/bloops/red/egg.png b/pocket_friends/game_files/surfaces/resources/images/bloops/red/egg.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/bloops/red/egg.png
rename to pocket_friends/game_files/surfaces/resources/images/bloops/red/egg.png
diff --git a/pocket_friends/game_files/resources/images/debug/invalid.png b/pocket_friends/game_files/surfaces/resources/images/debug/invalid.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/debug/invalid.png
rename to pocket_friends/game_files/surfaces/resources/images/debug/invalid.png
diff --git a/pocket_friends/game_files/resources/images/gui/apple.png b/pocket_friends/game_files/surfaces/resources/images/gui/apple.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/apple.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/apple.png
diff --git a/pocket_friends/game_files/resources/images/gui/bar_graphic.png b/pocket_friends/game_files/surfaces/resources/images/gui/bar_graphic.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/bar_graphic.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/bar_graphic.png
diff --git a/pocket_friends/game_files/resources/images/gui/bar_outline.png b/pocket_friends/game_files/surfaces/resources/images/gui/bar_outline.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/bar_outline.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/bar_outline.png
diff --git a/pocket_friends/game_files/resources/images/gui/blank_star.png b/pocket_friends/game_files/surfaces/resources/images/gui/blank_star.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/blank_star.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/blank_star.png
diff --git a/pocket_friends/game_files/resources/images/gui/down_arrow.png b/pocket_friends/game_files/surfaces/resources/images/gui/down_arrow.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/down_arrow.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/down_arrow.png
diff --git a/pocket_friends/game_files/resources/images/gui/egg_selector.png b/pocket_friends/game_files/surfaces/resources/images/gui/egg_selector.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/egg_selector.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/egg_selector.png
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/apple.json b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/apple.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/apple.json
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/apple.json
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/apple.png b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/apple.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/apple.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/apple.png
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/bed.json b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/bed.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/bed.json
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/bed.json
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/bed.png b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/bed.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/bed.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/bed.png
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/controller.json b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/controller.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/controller.json
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/controller.json
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/controller.png b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/controller.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/controller.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/controller.png
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.json b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/dumbbell.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.json
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/dumbbell.json
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.png b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/dumbbell.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/dumbbell.png
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/frame.png b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/frame.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/frame.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/frame.png
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/stats.json b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/stats.json
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/stats.json
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/stats.json
diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/stats.png b/pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/stats.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/popup_menu/stats.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/stats.png
diff --git a/pocket_friends/game_files/resources/images/gui/smiley.png b/pocket_friends/game_files/surfaces/resources/images/gui/smiley.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/smiley.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/smiley.png
diff --git a/pocket_friends/game_files/resources/images/gui/star.png b/pocket_friends/game_files/surfaces/resources/images/gui/star.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/star.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/star.png
diff --git a/pocket_friends/game_files/resources/images/gui/up_arrow.png b/pocket_friends/game_files/surfaces/resources/images/gui/up_arrow.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/gui/up_arrow.png
rename to pocket_friends/game_files/surfaces/resources/images/gui/up_arrow.png
diff --git a/pocket_friends/game_files/resources/images/promotional.png b/pocket_friends/game_files/surfaces/resources/images/promotional.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/promotional.png
rename to pocket_friends/game_files/surfaces/resources/images/promotional.png
diff --git a/pocket_friends/game_files/resources/images/title.png b/pocket_friends/game_files/surfaces/resources/images/title.png
similarity index 100%
rename from pocket_friends/game_files/resources/images/title.png
rename to pocket_friends/game_files/surfaces/resources/images/title.png