diff --git a/map_events/rpg_elder_house/events.json b/map_events/rpg_elder_house/events.json
new file mode 100644
index 0000000..ae11fc7
--- /dev/null
+++ b/map_events/rpg_elder_house/events.json
@@ -0,0 +1,50 @@
+{
+  "Events": [
+    {
+      "Id": "exit",
+      "X": 6,
+      "Y": 9,
+      "Trigger": "Touch",
+      "Teleport": {
+        "Map": "rpg_village",
+        "X": 6,
+        "Y": 7,
+        "Dir": "Down"
+      }
+    },
+    {
+      "Id": "elder_quest",
+      "X": 6,
+      "Y": 3,
+      "Sprite": "village/elder",
+      "Dir": "Down",
+      "Scenario": "rpg_demo/events/elder_quest",
+      "Condition": "rpg_wolf_dead != 1"
+    },
+    {
+      "Id": "elder_thanks",
+      "X": 6,
+      "Y": 3,
+      "Sprite": "village/elder",
+      "Dir": "Down",
+      "Scenario": "rpg_demo/events/elder_thanks",
+      "Condition": "rpg_wolf_dead == 1"
+    },
+    {
+      "Id": "chest",
+      "X": 9,
+      "Y": 7,
+      "Tile": 14,
+      "Scenario": "rpg_demo/events/house_chest",
+      "Condition": "rpg_house_chest != 1"
+    },
+    {
+      "Id": "chest_open",
+      "X": 9,
+      "Y": 7,
+      "Tile": 15,
+      "Scenario": "rpg_demo/events/chest_empty",
+      "Condition": "rpg_house_chest == 1"
+    }
+  ]
+}
diff --git a/map_events/rpg_forest/events.json b/map_events/rpg_forest/events.json
new file mode 100644
index 0000000..ea5fa9a
--- /dev/null
+++ b/map_events/rpg_forest/events.json
@@ -0,0 +1,259 @@
+{
+  "Events": [
+    {
+      "Id": "to_village",
+      "X": 0,
+      "Y": 8,
+      "Trigger": "Touch",
+      "Teleport": {
+        "Map": "rpg_village",
+        "X": 30,
+        "Y": 9,
+        "Dir": "Left"
+      }
+    },
+    {
+      "Id": "wolf_boss",
+      "X": 25,
+      "Y": 8,
+      "Sprite": "village/wolf",
+      "Dir": "Left",
+      "Scenario": "rpg_demo/events/wolf_boss",
+      "Condition": "rpg_wolf_dead != 1"
+    },
+    {
+      "Id": "chest",
+      "X": 16,
+      "Y": 3,
+      "Tile": 14,
+      "Scenario": "rpg_demo/events/forest_chest",
+      "Condition": "rpg_forest_chest != 1"
+    },
+    {
+      "Id": "chest_open",
+      "X": 16,
+      "Y": 3,
+      "Tile": 15,
+      "Scenario": "rpg_demo/events/chest_empty",
+      "Condition": "rpg_forest_chest == 1"
+    },
+    {
+      "Id": "slime",
+      "X": 10,
+      "Y": 8,
+      "Sprite": "village/slime",
+      "Scenario": "rpg_demo/events/slime",
+      "Condition": "rpg_path_slime != 1"
+    },
+    {
+      "Id": "pick_branches_1",
+      "X": 6,
+      "Y": 5,
+      "Tile": 32,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_branches",
+      "Commands": [
+        "flag rpg_pick_branches_1 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_branches_1 != 1"
+    },
+    {
+      "Id": "pick_branches_2",
+      "X": 9,
+      "Y": 2,
+      "Tile": 32,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_branches",
+      "Commands": [
+        "flag rpg_pick_branches_2 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_branches_2 != 1"
+    },
+    {
+      "Id": "pick_branches_3",
+      "X": 20,
+      "Y": 6,
+      "Tile": 32,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_branches",
+      "Commands": [
+        "flag rpg_pick_branches_3 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_branches_3 != 1"
+    },
+    {
+      "Id": "pick_branches_4",
+      "X": 12,
+      "Y": 12,
+      "Tile": 32,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_branches",
+      "Commands": [
+        "flag rpg_pick_branches_4 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_branches_4 != 1"
+    },
+    {
+      "Id": "pick_branches_5",
+      "X": 23,
+      "Y": 14,
+      "Tile": 32,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_branches",
+      "Commands": [
+        "flag rpg_pick_branches_5 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_branches_5 != 1"
+    },
+    {
+      "Id": "pick_stones_1",
+      "X": 11,
+      "Y": 3,
+      "Tile": 33,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_stones",
+      "Commands": [
+        "flag rpg_pick_stones_1 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_stones_1 != 1"
+    },
+    {
+      "Id": "pick_stones_2",
+      "X": 21,
+      "Y": 7,
+      "Tile": 33,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_stones",
+      "Commands": [
+        "flag rpg_pick_stones_2 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_stones_2 != 1"
+    },
+    {
+      "Id": "pick_stones_3",
+      "X": 24,
+      "Y": 12,
+      "Tile": 33,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_stones",
+      "Commands": [
+        "flag rpg_pick_stones_3 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_stones_3 != 1"
+    },
+    {
+      "Id": "pick_stones_4",
+      "X": 26,
+      "Y": 15,
+      "Tile": 33,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_stones",
+      "Commands": [
+        "flag rpg_pick_stones_4 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_stones_4 != 1"
+    },
+    {
+      "Id": "pick_stones_5",
+      "X": 14,
+      "Y": 9,
+      "Tile": 33,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_stones",
+      "Commands": [
+        "flag rpg_pick_stones_5 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_stones_5 != 1"
+    },
+    {
+      "Id": "pick_mushroom_1",
+      "X": 10,
+      "Y": 3,
+      "Tile": 34,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_mushroom",
+      "Commands": [
+        "flag rpg_pick_mushroom_1 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_mushroom_1 != 1"
+    },
+    {
+      "Id": "pick_mushroom_2",
+      "X": 23,
+      "Y": 7,
+      "Tile": 34,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_mushroom",
+      "Commands": [
+        "flag rpg_pick_mushroom_2 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_mushroom_2 != 1"
+    },
+    {
+      "Id": "pick_mushroom_3",
+      "X": 21,
+      "Y": 14,
+      "Tile": 34,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_mushroom",
+      "Commands": [
+        "flag rpg_pick_mushroom_3 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_mushroom_3 != 1"
+    },
+    {
+      "Id": "pick_mushroom_4",
+      "X": 2,
+      "Y": 13,
+      "Tile": 34,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_mushroom",
+      "Commands": [
+        "flag rpg_pick_mushroom_4 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_mushroom_4 != 1"
+    },
+    {
+      "Id": "pick_mushroom_5",
+      "X": 20,
+      "Y": 5,
+      "Tile": 34,
+      "Trigger": "Touch",
+      "Solid": false,
+      "Scenario": "rpg_demo/events/pick_mushroom",
+      "Commands": [
+        "flag rpg_pick_mushroom_5 1",
+        "end"
+      ],
+      "Condition": "rpg_pick_mushroom_5 != 1"
+    }
+  ]
+}
diff --git a/map_events/rpg_village/events.json b/map_events/rpg_village/events.json
new file mode 100644
index 0000000..c87255a
--- /dev/null
+++ b/map_events/rpg_village/events.json
@@ -0,0 +1,59 @@
+{
+  "Events": [
+    {
+      "Id": "door_elder",
+      "X": 6,
+      "Y": 6,
+      "Trigger": "Touch",
+      "Teleport": {
+        "Map": "rpg_elder_house",
+        "X": 6,
+        "Y": 8,
+        "Dir": "Up"
+      }
+    },
+    {
+      "Id": "door_merchant",
+      "X": 21,
+      "Y": 6,
+      "Trigger": "Action",
+      "Solid": true,
+      "Scenario": "rpg_demo/events/locked_door"
+    },
+    {
+      "Id": "to_forest",
+      "X": 31,
+      "Y": 9,
+      "Trigger": "Touch",
+      "Teleport": {
+        "Map": "rpg_forest",
+        "X": 1,
+        "Y": 8,
+        "Dir": "Right"
+      }
+    },
+    {
+      "Id": "sign",
+      "X": 16,
+      "Y": 11,
+      "Tile": 13,
+      "Scenario": "rpg_demo/events/village_sign"
+    },
+    {
+      "Id": "villager",
+      "X": 9,
+      "Y": 10,
+      "Sprite": "village/villager",
+      "Dir": "Down",
+      "Scenario": "rpg_demo/events/villager"
+    },
+    {
+      "Id": "merchant",
+      "X": 22,
+      "Y": 8,
+      "Sprite": "village/merchant",
+      "Dir": "Left",
+      "Scenario": "rpg_demo/events/merchant"
+    }
+  ]
+}
diff --git a/maps/rpg_elder_house.json b/maps/rpg_elder_house.json
index 9629a97..20e5a59 100644
--- a/maps/rpg_elder_house.json
+++ b/maps/rpg_elder_house.json
@@ -51,55 +51,7 @@
         "X": 6,
         "Y": 8,
         "Dir": "Up"
-      },
-      "Events": [
-        {
-          "Id": "exit",
-          "X": 6,
-          "Y": 9,
-          "Trigger": "Touch",
-          "Teleport": {
-            "Map": "rpg_village",
-            "X": 6,
-            "Y": 7,
-            "Dir": "Down"
-          }
-        },
-        {
-          "Id": "elder_quest",
-          "X": 6,
-          "Y": 3,
-          "Sprite": "village/elder",
-          "Dir": "Down",
-          "Scenario": "rpg_demo/events/elder_quest",
-          "Condition": "rpg_wolf_dead != 1"
-        },
-        {
-          "Id": "elder_thanks",
-          "X": 6,
-          "Y": 3,
-          "Sprite": "village/elder",
-          "Dir": "Down",
-          "Scenario": "rpg_demo/events/elder_thanks",
-          "Condition": "rpg_wolf_dead == 1"
-        },
-        {
-          "Id": "chest",
-          "X": 9,
-          "Y": 7,
-          "Tile": 14,
-          "Scenario": "rpg_demo/events/house_chest",
-          "Condition": "rpg_house_chest != 1"
-        },
-        {
-          "Id": "chest_open",
-          "X": 9,
-          "Y": 7,
-          "Tile": 15,
-          "Scenario": "rpg_demo/events/chest_empty",
-          "Condition": "rpg_house_chest == 1"
-        }
-      ]
+      }
     }
   ]
 }
diff --git a/maps/rpg_forest.json b/maps/rpg_forest.json
index 37a9f7f..c69e725 100644
--- a/maps/rpg_forest.json
+++ b/maps/rpg_forest.json
@@ -95,263 +95,6 @@
         "Y": 8,
         "Dir": "Right"
       },
-      "Events": [
-        {
-          "Id": "to_village",
-          "X": 0,
-          "Y": 8,
-          "Trigger": "Touch",
-          "Teleport": {
-            "Map": "rpg_village",
-            "X": 30,
-            "Y": 9,
-            "Dir": "Left"
-          }
-        },
-        {
-          "Id": "wolf_boss",
-          "X": 25,
-          "Y": 8,
-          "Sprite": "village/wolf",
-          "Dir": "Left",
-          "Scenario": "rpg_demo/events/wolf_boss",
-          "Condition": "rpg_wolf_dead != 1"
-        },
-        {
-          "Id": "chest",
-          "X": 16,
-          "Y": 3,
-          "Tile": 14,
-          "Scenario": "rpg_demo/events/forest_chest",
-          "Condition": "rpg_forest_chest != 1"
-        },
-        {
-          "Id": "chest_open",
-          "X": 16,
-          "Y": 3,
-          "Tile": 15,
-          "Scenario": "rpg_demo/events/chest_empty",
-          "Condition": "rpg_forest_chest == 1"
-        },
-        {
-          "Id": "slime",
-          "X": 10,
-          "Y": 8,
-          "Sprite": "village/slime",
-          "Scenario": "rpg_demo/events/slime",
-          "Condition": "rpg_path_slime != 1"
-        },
-        {
-          "Id": "pick_branches_1",
-          "X": 6,
-          "Y": 5,
-          "Tile": 32,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_branches",
-          "Commands": [
-            "flag rpg_pick_branches_1 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_branches_1 != 1"
-        },
-        {
-          "Id": "pick_branches_2",
-          "X": 9,
-          "Y": 2,
-          "Tile": 32,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_branches",
-          "Commands": [
-            "flag rpg_pick_branches_2 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_branches_2 != 1"
-        },
-        {
-          "Id": "pick_branches_3",
-          "X": 20,
-          "Y": 6,
-          "Tile": 32,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_branches",
-          "Commands": [
-            "flag rpg_pick_branches_3 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_branches_3 != 1"
-        },
-        {
-          "Id": "pick_branches_4",
-          "X": 12,
-          "Y": 12,
-          "Tile": 32,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_branches",
-          "Commands": [
-            "flag rpg_pick_branches_4 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_branches_4 != 1"
-        },
-        {
-          "Id": "pick_branches_5",
-          "X": 23,
-          "Y": 14,
-          "Tile": 32,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_branches",
-          "Commands": [
-            "flag rpg_pick_branches_5 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_branches_5 != 1"
-        },
-        {
-          "Id": "pick_stones_1",
-          "X": 11,
-          "Y": 3,
-          "Tile": 33,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_stones",
-          "Commands": [
-            "flag rpg_pick_stones_1 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_stones_1 != 1"
-        },
-        {
-          "Id": "pick_stones_2",
-          "X": 21,
-          "Y": 7,
-          "Tile": 33,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_stones",
-          "Commands": [
-            "flag rpg_pick_stones_2 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_stones_2 != 1"
-        },
-        {
-          "Id": "pick_stones_3",
-          "X": 24,
-          "Y": 12,
-          "Tile": 33,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_stones",
-          "Commands": [
-            "flag rpg_pick_stones_3 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_stones_3 != 1"
-        },
-        {
-          "Id": "pick_stones_4",
-          "X": 26,
-          "Y": 15,
-          "Tile": 33,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_stones",
-          "Commands": [
-            "flag rpg_pick_stones_4 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_stones_4 != 1"
-        },
-        {
-          "Id": "pick_stones_5",
-          "X": 14,
-          "Y": 9,
-          "Tile": 33,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_stones",
-          "Commands": [
-            "flag rpg_pick_stones_5 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_stones_5 != 1"
-        },
-        {
-          "Id": "pick_mushroom_1",
-          "X": 10,
-          "Y": 3,
-          "Tile": 34,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_mushroom",
-          "Commands": [
-            "flag rpg_pick_mushroom_1 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_mushroom_1 != 1"
-        },
-        {
-          "Id": "pick_mushroom_2",
-          "X": 23,
-          "Y": 7,
-          "Tile": 34,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_mushroom",
-          "Commands": [
-            "flag rpg_pick_mushroom_2 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_mushroom_2 != 1"
-        },
-        {
-          "Id": "pick_mushroom_3",
-          "X": 21,
-          "Y": 14,
-          "Tile": 34,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_mushroom",
-          "Commands": [
-            "flag rpg_pick_mushroom_3 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_mushroom_3 != 1"
-        },
-        {
-          "Id": "pick_mushroom_4",
-          "X": 2,
-          "Y": 13,
-          "Tile": 34,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_mushroom",
-          "Commands": [
-            "flag rpg_pick_mushroom_4 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_mushroom_4 != 1"
-        },
-        {
-          "Id": "pick_mushroom_5",
-          "X": 20,
-          "Y": 5,
-          "Tile": 34,
-          "Trigger": "Touch",
-          "Solid": false,
-          "Scenario": "rpg_demo/events/pick_mushroom",
-          "Commands": [
-            "flag rpg_pick_mushroom_5 1",
-            "end"
-          ],
-          "Condition": "rpg_pick_mushroom_5 != 1"
-        }
-      ],
       "Encounters": {
         "Steps": 28,
         "Groups": [
diff --git a/maps/rpg_village.json b/maps/rpg_village.json
index 95c0baa..700ffa0 100644
--- a/maps/rpg_village.json
+++ b/maps/rpg_village.json
@@ -94,64 +94,7 @@
         "X": 15,
         "Y": 14,
         "Dir": "Up"
-      },
-      "Events": [
-        {
-          "Id": "door_elder",
-          "X": 6,
-          "Y": 6,
-          "Trigger": "Touch",
-          "Teleport": {
-            "Map": "rpg_elder_house",
-            "X": 6,
-            "Y": 8,
-            "Dir": "Up"
-          }
-        },
-        {
-          "Id": "door_merchant",
-          "X": 21,
-          "Y": 6,
-          "Trigger": "Action",
-          "Solid": true,
-          "Scenario": "rpg_demo/events/locked_door"
-        },
-        {
-          "Id": "to_forest",
-          "X": 31,
-          "Y": 9,
-          "Trigger": "Touch",
-          "Teleport": {
-            "Map": "rpg_forest",
-            "X": 1,
-            "Y": 8,
-            "Dir": "Right"
-          }
-        },
-        {
-          "Id": "sign",
-          "X": 16,
-          "Y": 11,
-          "Tile": 13,
-          "Scenario": "rpg_demo/events/village_sign"
-        },
-        {
-          "Id": "villager",
-          "X": 9,
-          "Y": 10,
-          "Sprite": "village/villager",
-          "Dir": "Down",
-          "Scenario": "rpg_demo/events/villager"
-        },
-        {
-          "Id": "merchant",
-          "X": 22,
-          "Y": 8,
-          "Sprite": "village/merchant",
-          "Dir": "Left",
-          "Scenario": "rpg_demo/events/merchant"
-        }
-      ]
+      }
     }
   ]
 }