diff --git a/flatland/utils/graphics_pil.py b/flatland/utils/graphics_pil.py
index bcd0055130ce67e36e418680682b8a6b19533ccf..4da136d4a9d353befc9a1daf1dc682947a513046 100644
--- a/flatland/utils/graphics_pil.py
+++ b/flatland/utils/graphics_pil.py
@@ -31,13 +31,6 @@ from screeninfo import get_monitors  # noqa: E402
 
 from flatland.core.grid.rail_env_grid import RailEnvTransitions  # noqa: E402
 
-def join_filenames(root_folder, filenames):
-    filenames = [
-        os.path.join(root_folder, filename)
-        for filename in filenames
-    ]
-    return filenames
-
 
 class PILGL(GraphicsLayer):
     # tk.Tk() must be a singleton!
@@ -321,27 +314,26 @@ class PILSVG(PILGL):
 
     def load_buildings(self):
         dBuildingFiles = [
-            "Bank.svg",
-            "Bar.svg",
-            "Wohnhaus.svg",
-            "Hochhaus.svg",
-            "Hotel.svg",
-            "Office.svg",
-            "Polizei.svg",
-            "Post.svg",
-            "Supermarkt.svg",
-            "Tankstelle.svg",
-            "Fabrik_A.svg",
-            "Fabrik_B.svg",
-            "Fabrik_C.svg",
-            "Fabrik_D.svg",
-            "Fabrik_E.svg",
-            "Fabrik_F.svg",
-            "Fabrik_G.svg",
-            "Fabrik_H.svg",
-            "Fabrik_I.svg",
+            "Buildings-Bank.svg",
+            "Buildings-Bar.svg",
+            "Buildings-Wohnhaus.svg",
+            "Buildings-Hochhaus.svg",
+            "Buildings-Hotel.svg",
+            "Buildings-Office.svg",
+            "Buildings-Polizei.svg",
+            "Buildings-Post.svg",
+            "Buildings-Supermarkt.svg",
+            "Buildings-Tankstelle.svg",
+            "Buildings-Fabrik_A.svg",
+            "Buildings-Fabrik_B.svg",
+            "Buildings-Fabrik_C.svg",
+            "Buildings-Fabrik_D.svg",
+            "Buildings-Fabrik_E.svg",
+            "Buildings-Fabrik_F.svg",
+            "Buildings-Fabrik_G.svg",
+            "Buildings-Fabrik_H.svg",
+            "Buildings-Fabrik_I.svg"
         ]
-        dBuildingFiles = join_filenames("Buildings", dBuildingFiles)
 
         imgBg = self.pil_from_svg_file('svg', "Background_city.svg")
 
@@ -353,27 +345,24 @@ class PILSVG(PILGL):
 
     def load_scenery(self):
         scenery_files = [
-            "Laubbaume_A.svg",
-            "Laubbaume_B.svg",
-            "Laubbaume_C.svg",
-            "Nadelbaume_A.svg",
-            "Nadelbaume_B.svg",
-            "Bergwelt_B.svg"
+            "Scenery-Laubbaume_A.svg",
+            "Scenery-Laubbaume_B.svg",
+            "Scenery-Laubbaume_C.svg",
+            "Scenery-Nadelbaume_A.svg",
+            "Scenery-Nadelbaume_B.svg",
+            "Scenery-Bergwelt_B.svg"
         ]
-        scenery_files = join_filenames("Scenery", scenery_files)
 
         scenery_files_d2 = [
-            "Bergwelt_C_Teil_1_links.svg",
-            "Bergwelt_C_Teil_2_rechts.svg"
+            "Scenery-Bergwelt_C_Teil_1_links.svg",
+            "Scenery-Bergwelt_C_Teil_2_rechts.svg"
         ]
-        scenery_files_d2 = join_filenames("Scenery", scenery_files_d2)
 
         scenery_files_d3 = [
-            "Bergwelt_A_Teil_3_rechts.svg",
-            "Bergwelt_A_Teil_2_mitte.svg",
-            "Bergwelt_A_Teil_1_links.svg"
+            "Scenery-Bergwelt_A_Teil_3_rechts.svg",
+            "Scenery-Bergwelt_A_Teil_2_mitte.svg",
+            "Scenery-Bergwelt_A_Teil_1_links.svg"
         ]
-        scenery_files_d3 = join_filenames("Scenery", scenery_files_d3)
 
         img_back_ground = self.pil_from_svg_file('svg', "Background_Light_green.svg")
 
diff --git a/svg/Buildings/Bank.svg b/svg/Buildings-Bank.svg
similarity index 100%
rename from svg/Buildings/Bank.svg
rename to svg/Buildings-Bank.svg
diff --git a/svg/Buildings/Bar.svg b/svg/Buildings-Bar.svg
similarity index 100%
rename from svg/Buildings/Bar.svg
rename to svg/Buildings-Bar.svg
diff --git a/svg/Buildings/Fabrik_A.svg b/svg/Buildings-Fabrik_A.svg
similarity index 100%
rename from svg/Buildings/Fabrik_A.svg
rename to svg/Buildings-Fabrik_A.svg
diff --git a/svg/Buildings/Fabrik_B.svg b/svg/Buildings-Fabrik_B.svg
similarity index 100%
rename from svg/Buildings/Fabrik_B.svg
rename to svg/Buildings-Fabrik_B.svg
diff --git a/svg/Buildings/Fabrik_C.svg b/svg/Buildings-Fabrik_C.svg
similarity index 100%
rename from svg/Buildings/Fabrik_C.svg
rename to svg/Buildings-Fabrik_C.svg
diff --git a/svg/Buildings/Fabrik_D.svg b/svg/Buildings-Fabrik_D.svg
similarity index 100%
rename from svg/Buildings/Fabrik_D.svg
rename to svg/Buildings-Fabrik_D.svg
diff --git a/svg/Buildings/Fabrik_E.svg b/svg/Buildings-Fabrik_E.svg
similarity index 100%
rename from svg/Buildings/Fabrik_E.svg
rename to svg/Buildings-Fabrik_E.svg
diff --git a/svg/Buildings/Fabrik_F.svg b/svg/Buildings-Fabrik_F.svg
similarity index 100%
rename from svg/Buildings/Fabrik_F.svg
rename to svg/Buildings-Fabrik_F.svg
diff --git a/svg/Buildings/Fabrik_G.svg b/svg/Buildings-Fabrik_G.svg
similarity index 100%
rename from svg/Buildings/Fabrik_G.svg
rename to svg/Buildings-Fabrik_G.svg
diff --git a/svg/Buildings/Fabrik_H.svg b/svg/Buildings-Fabrik_H.svg
similarity index 100%
rename from svg/Buildings/Fabrik_H.svg
rename to svg/Buildings-Fabrik_H.svg
diff --git a/svg/Buildings/Fabrik_I.svg b/svg/Buildings-Fabrik_I.svg
similarity index 100%
rename from svg/Buildings/Fabrik_I.svg
rename to svg/Buildings-Fabrik_I.svg
diff --git a/svg/Buildings/Hochhaus.svg b/svg/Buildings-Hochhaus.svg
similarity index 100%
rename from svg/Buildings/Hochhaus.svg
rename to svg/Buildings-Hochhaus.svg
diff --git a/svg/Buildings/Hotel.svg b/svg/Buildings-Hotel.svg
similarity index 100%
rename from svg/Buildings/Hotel.svg
rename to svg/Buildings-Hotel.svg
diff --git a/svg/Buildings/Office.svg b/svg/Buildings-Office.svg
similarity index 100%
rename from svg/Buildings/Office.svg
rename to svg/Buildings-Office.svg
diff --git a/svg/Buildings/Polizei.svg b/svg/Buildings-Polizei.svg
similarity index 100%
rename from svg/Buildings/Polizei.svg
rename to svg/Buildings-Polizei.svg
diff --git a/svg/Buildings/Post.svg b/svg/Buildings-Post.svg
similarity index 100%
rename from svg/Buildings/Post.svg
rename to svg/Buildings-Post.svg
diff --git a/svg/Buildings/Supermarkt.svg b/svg/Buildings-Supermarkt.svg
similarity index 100%
rename from svg/Buildings/Supermarkt.svg
rename to svg/Buildings-Supermarkt.svg
diff --git a/svg/Buildings/Tankstelle.svg b/svg/Buildings-Tankstelle.svg
similarity index 100%
rename from svg/Buildings/Tankstelle.svg
rename to svg/Buildings-Tankstelle.svg
diff --git a/svg/Buildings/Wohnhaus.svg b/svg/Buildings-Wohnhaus.svg
similarity index 100%
rename from svg/Buildings/Wohnhaus.svg
rename to svg/Buildings-Wohnhaus.svg
diff --git a/svg/Scenery/Bergwelt_A_Teil_1_links.svg b/svg/Scenery-Bergwelt_A_Teil_1_links.svg
similarity index 100%
rename from svg/Scenery/Bergwelt_A_Teil_1_links.svg
rename to svg/Scenery-Bergwelt_A_Teil_1_links.svg
diff --git a/svg/Scenery/Bergwelt_A_Teil_2_mitte.svg b/svg/Scenery-Bergwelt_A_Teil_2_mitte.svg
similarity index 100%
rename from svg/Scenery/Bergwelt_A_Teil_2_mitte.svg
rename to svg/Scenery-Bergwelt_A_Teil_2_mitte.svg
diff --git a/svg/Scenery/Bergwelt_A_Teil_3_rechts.svg b/svg/Scenery-Bergwelt_A_Teil_3_rechts.svg
similarity index 100%
rename from svg/Scenery/Bergwelt_A_Teil_3_rechts.svg
rename to svg/Scenery-Bergwelt_A_Teil_3_rechts.svg
diff --git a/svg/Scenery/Bergwelt_B.svg b/svg/Scenery-Bergwelt_B.svg
similarity index 100%
rename from svg/Scenery/Bergwelt_B.svg
rename to svg/Scenery-Bergwelt_B.svg
diff --git a/svg/Scenery/Bergwelt_C_Teil_1_links.svg b/svg/Scenery-Bergwelt_C_Teil_1_links.svg
similarity index 100%
rename from svg/Scenery/Bergwelt_C_Teil_1_links.svg
rename to svg/Scenery-Bergwelt_C_Teil_1_links.svg
diff --git a/svg/Scenery/Bergwelt_C_Teil_2_rechts.svg b/svg/Scenery-Bergwelt_C_Teil_2_rechts.svg
similarity index 100%
rename from svg/Scenery/Bergwelt_C_Teil_2_rechts.svg
rename to svg/Scenery-Bergwelt_C_Teil_2_rechts.svg
diff --git a/svg/Scenery/Laubbaume_A.svg b/svg/Scenery-Laubbaume_A.svg
similarity index 100%
rename from svg/Scenery/Laubbaume_A.svg
rename to svg/Scenery-Laubbaume_A.svg
diff --git a/svg/Scenery/Laubbaume_B.svg b/svg/Scenery-Laubbaume_B.svg
similarity index 100%
rename from svg/Scenery/Laubbaume_B.svg
rename to svg/Scenery-Laubbaume_B.svg
diff --git a/svg/Scenery/Laubbaume_C.svg b/svg/Scenery-Laubbaume_C.svg
similarity index 100%
rename from svg/Scenery/Laubbaume_C.svg
rename to svg/Scenery-Laubbaume_C.svg
diff --git a/svg/Scenery/Nadelbaume_A.svg b/svg/Scenery-Nadelbaume_A.svg
similarity index 100%
rename from svg/Scenery/Nadelbaume_A.svg
rename to svg/Scenery-Nadelbaume_A.svg
diff --git a/svg/Scenery/Nadelbaume_B.svg b/svg/Scenery-Nadelbaume_B.svg
similarity index 100%
rename from svg/Scenery/Nadelbaume_B.svg
rename to svg/Scenery-Nadelbaume_B.svg