diff --git a/pedsim_simulator/maps/airport.pgm b/pedsim_simulator/maps/maps/airport.pgm
similarity index 100%
rename from pedsim_simulator/maps/airport.pgm
rename to pedsim_simulator/maps/maps/airport.pgm
diff --git a/pedsim_simulator/maps/airport2.pgm b/pedsim_simulator/maps/maps/airport2.pgm
similarity index 100%
rename from pedsim_simulator/maps/airport2.pgm
rename to pedsim_simulator/maps/maps/airport2.pgm
diff --git a/pedsim_simulator/maps/airport_activities.pgm b/pedsim_simulator/maps/maps/airport_activities.pgm
similarity index 100%
rename from pedsim_simulator/maps/airport_activities.pgm
rename to pedsim_simulator/maps/maps/airport_activities.pgm
diff --git a/pedsim_simulator/maps/airport_activities2.pgm b/pedsim_simulator/maps/maps/airport_activities2.pgm
similarity index 100%
rename from pedsim_simulator/maps/airport_activities2.pgm
rename to pedsim_simulator/maps/maps/airport_activities2.pgm
diff --git a/pedsim_simulator/maps/blank_world.pgm b/pedsim_simulator/maps/maps/blank_world.pgm
similarity index 100%
rename from pedsim_simulator/maps/blank_world.pgm
rename to pedsim_simulator/maps/maps/blank_world.pgm
diff --git a/pedsim_simulator/maps/corridor.pgm b/pedsim_simulator/maps/maps/corridor.pgm
similarity index 100%
rename from pedsim_simulator/maps/corridor.pgm
rename to pedsim_simulator/maps/maps/corridor.pgm
diff --git a/pedsim_simulator/maps/office-cubicles.pgm b/pedsim_simulator/maps/maps/office-cubicles.pgm
similarity index 100%
rename from pedsim_simulator/maps/office-cubicles.pgm
rename to pedsim_simulator/maps/maps/office-cubicles.pgm
diff --git a/pedsim_simulator/maps/office.pgm b/pedsim_simulator/maps/maps/office.pgm
similarity index 100%
rename from pedsim_simulator/maps/office.pgm
rename to pedsim_simulator/maps/maps/office.pgm
diff --git a/pedsim_simulator/maps/scene1.pgm b/pedsim_simulator/maps/maps/scene1.pgm
similarity index 100%
rename from pedsim_simulator/maps/scene1.pgm
rename to pedsim_simulator/maps/maps/scene1.pgm
diff --git a/pedsim_simulator/maps/scene2.pgm b/pedsim_simulator/maps/maps/scene2.pgm
similarity index 100%
rename from pedsim_simulator/maps/scene2.pgm
rename to pedsim_simulator/maps/maps/scene2.pgm
diff --git a/pedsim_simulator/maps/scene3.pgm b/pedsim_simulator/maps/maps/scene3.pgm
similarity index 100%
rename from pedsim_simulator/maps/scene3.pgm
rename to pedsim_simulator/maps/maps/scene3.pgm
diff --git a/pedsim_simulator/maps/scene4.pgm b/pedsim_simulator/maps/maps/scene4.pgm
similarity index 100%
rename from pedsim_simulator/maps/scene4.pgm
rename to pedsim_simulator/maps/maps/scene4.pgm
diff --git a/pedsim_simulator/maps/singleagent.pgm b/pedsim_simulator/maps/maps/singleagent.pgm
similarity index 100%
rename from pedsim_simulator/maps/singleagent.pgm
rename to pedsim_simulator/maps/maps/singleagent.pgm
diff --git a/pedsim_simulator/maps/small_airport.pgm b/pedsim_simulator/maps/maps/small_airport.pgm
similarity index 100%
rename from pedsim_simulator/maps/small_airport.pgm
rename to pedsim_simulator/maps/maps/small_airport.pgm
diff --git a/pedsim_simulator/maps/social_contexts.pgm b/pedsim_simulator/maps/maps/social_contexts.pgm
similarity index 100%
rename from pedsim_simulator/maps/social_contexts.pgm
rename to pedsim_simulator/maps/maps/social_contexts.pgm
diff --git a/pedsim_simulator/maps/tb3_house_demo_crowd.pgm b/pedsim_simulator/maps/maps/tb3_house_demo_crowd.pgm
similarity index 100%
rename from pedsim_simulator/maps/tb3_house_demo_crowd.pgm
rename to pedsim_simulator/maps/maps/tb3_house_demo_crowd.pgm
diff --git a/pedsim_simulator/maps/warehouse.pgm b/pedsim_simulator/maps/maps/warehouse.pgm
similarity index 100%
rename from pedsim_simulator/maps/warehouse.pgm
rename to pedsim_simulator/maps/maps/warehouse.pgm