diff --git a/exp_scenario/module/control.lua b/exp_scenario/module/control.lua
index ad7066b6..3b00dcde 100644
--- a/exp_scenario/module/control.lua
+++ b/exp_scenario/module/control.lua
@@ -81,3 +81,5 @@ add(require("modules/exp_scenario/gui/rocket_info"))
 add(require("modules/exp_scenario/gui/science_production"))
 add(require("modules/exp_scenario/gui/surveillance"))
 add(require("modules/exp_scenario/gui/task_list"))
+add(require("modules/exp_scenario/gui/debug/shim"))
+add(require("modules/exp_scenario/gui/debug/event_view"))
diff --git a/exp_legacy/module/modules/gui/debug/_g_view.lua b/exp_scenario/module/gui/debug/_g_view.lua
similarity index 94%
rename from exp_legacy/module/modules/gui/debug/_g_view.lua
rename to exp_scenario/module/gui/debug/_g_view.lua
index 107f9e14..49e93645 100644
--- a/exp_legacy/module/modules/gui/debug/_g_view.lua
+++ b/exp_scenario/module/gui/debug/_g_view.lua
@@ -1,5 +1,5 @@
-local Gui = require("modules.exp_legacy.utils.gui") --- @dep utils.gui
-local Model = require("modules.exp_legacy.modules.gui.debug.model") --- @dep modules.gui.debug.model
+local Gui = require("modules/exp_scenario/gui/debug/shim")
+local Model = require("modules/exp_scenario/gui/debug/model")
 local Color = require("modules/exp_util/include/color")
 
 local dump = Model.dump
diff --git a/exp_legacy/module/modules/gui/debug/event_view.lua b/exp_scenario/module/gui/debug/event_view.lua
similarity index 95%
rename from exp_legacy/module/modules/gui/debug/event_view.lua
rename to exp_scenario/module/gui/debug/event_view.lua
index b2d84ded..e7261105 100644
--- a/exp_legacy/module/modules/gui/debug/event_view.lua
+++ b/exp_scenario/module/gui/debug/event_view.lua
@@ -1,7 +1,6 @@
-local Event = require("modules/exp_legacy/utils/event")
 local Storage = require("modules/exp_util/storage")
-local Gui = require("modules.exp_legacy.utils.gui")
-local Model = require("modules.exp_legacy.modules.gui.debug.model")
+local Gui = require("modules/exp_scenario/gui/debug/shim")
+local Model = require("modules/exp_scenario/gui/debug/model")
 
 local format = string.format
 local insert = table.insert
@@ -14,6 +13,7 @@ local events_to_keep = 10
 -- Local vars
 local Public = {
     name = "Events",
+    events = {}
 }
 local name_lookup = {}
 
@@ -168,7 +168,7 @@ Gui.on_click(
 -- Event registers (TODO: turn to removable hooks.. maybe)
 for name, id in pairs(events) do
     name_lookup[id] = name
-    Event.add(id, event_callback)
+    Public.events[id] = event_callback
 end
 
 return Public
diff --git a/exp_legacy/module/modules/gui/debug/expcore_datastore_view.lua b/exp_scenario/module/gui/debug/expcore_datastore_view.lua
similarity index 95%
rename from exp_legacy/module/modules/gui/debug/expcore_datastore_view.lua
rename to exp_scenario/module/gui/debug/expcore_datastore_view.lua
index 97b9e4f0..10bb9263 100644
--- a/exp_legacy/module/modules/gui/debug/expcore_datastore_view.lua
+++ b/exp_scenario/module/gui/debug/expcore_datastore_view.lua
@@ -1,7 +1,7 @@
-local Gui = require("modules.exp_legacy.utils.gui") --- @dep utils.gui
-local Datastore = require("modules.exp_legacy.expcore.datastore") --- @dep expcore.datastore
+local Gui = require("modules/exp_scenario/gui/debug/shim")
+local Datastore = require("modules.exp_legacy.expcore.datastore")
 local Color = require("modules/exp_util/include/color")
-local Model = require("modules.exp_legacy.modules.gui.debug.model") --- @dep modules.gui.debug.model
+local Model = require("modules/exp_scenario/gui/debug/model")
 
 local dump = Model.dump
 local concat = table.concat
diff --git a/exp_legacy/module/modules/gui/debug/expcore_gui_view.lua b/exp_scenario/module/gui/debug/expcore_gui_view.lua
similarity index 96%
rename from exp_legacy/module/modules/gui/debug/expcore_gui_view.lua
rename to exp_scenario/module/gui/debug/expcore_gui_view.lua
index 366157b3..4fd18849 100644
--- a/exp_legacy/module/modules/gui/debug/expcore_gui_view.lua
+++ b/exp_scenario/module/gui/debug/expcore_gui_view.lua
@@ -3,8 +3,8 @@ local ExpData = require("modules/exp_gui/data")
 local ExpIter = require("modules/exp_gui/iter")
 local Color = require("modules/exp_util/include/color")
 
-local Gui = require("modules.exp_legacy.utils.gui") --- @dep utils.gui
-local Model = require("modules.exp_legacy.modules.gui.debug.model") --- @dep modules.gui.debug.model
+local Gui = require("modules/exp_scenario/gui/debug/shim")
+local Model = require("modules/exp_scenario/gui/debug/model")
 
 local dump = Model.dump
 local dump_text = Model.dump_text
diff --git a/exp_legacy/module/modules/gui/debug/global_view.lua b/exp_scenario/module/gui/debug/global_view.lua
similarity index 95%
rename from exp_legacy/module/modules/gui/debug/global_view.lua
rename to exp_scenario/module/gui/debug/global_view.lua
index 03da4ae9..73ae4d06 100644
--- a/exp_legacy/module/modules/gui/debug/global_view.lua
+++ b/exp_scenario/module/gui/debug/global_view.lua
@@ -1,5 +1,5 @@
-local Gui = require("modules.exp_legacy.utils.gui") --- @dep utils.gui
-local Model = require("modules.exp_legacy.modules.gui.debug.model") --- @dep modules.gui.debug.model
+local Gui = require("modules/exp_scenario/gui/debug/shim")
+local Model = require("modules/exp_scenario/gui/debug/model")
 local Color = require("modules/exp_util/include/color")
 
 local dump = Model.dump
diff --git a/exp_legacy/module/modules/gui/debug/main_view.lua b/exp_scenario/module/gui/debug/main_view.lua
similarity index 83%
rename from exp_legacy/module/modules/gui/debug/main_view.lua
rename to exp_scenario/module/gui/debug/main_view.lua
index 393bdade..bd2b5eb7 100644
--- a/exp_legacy/module/modules/gui/debug/main_view.lua
+++ b/exp_scenario/module/gui/debug/main_view.lua
@@ -1,16 +1,16 @@
-local Gui = require("modules.exp_legacy.utils.gui") --- @dep utils.gui
+local Gui = require("modules/exp_scenario/gui/debug/shim")
 local Color = require("modules/exp_util/include/color")
 
 local Public = {}
 
 local pages = {
-    require("modules.exp_legacy.modules.gui.debug.redmew_global_view"),
-    require("modules.exp_legacy.modules.gui.debug.expcore_datastore_view"),
-    require("modules.exp_legacy.modules.gui.debug.expcore_gui_view"),
-    require("modules.exp_legacy.modules.gui.debug.global_view"),
-    require("modules.exp_legacy.modules.gui.debug.package_view"),
-    require("modules.exp_legacy.modules.gui.debug._g_view"),
-    require("modules.exp_legacy.modules.gui.debug.event_view"),
+    require("modules/exp_scenario/gui/debug/redmew_global_view"),
+    require("modules/exp_scenario/gui/debug/expcore_datastore_view"),
+    require("modules/exp_scenario/gui/debug/expcore_gui_view"),
+    require("modules/exp_scenario/gui/debug/global_view"),
+    require("modules/exp_scenario/gui/debug/package_view"),
+    require("modules/exp_scenario/gui/debug/_g_view"),
+    require("modules/exp_scenario/gui/debug/event_view"),
 }
 
 local main_frame_name = Gui.uid_name()
diff --git a/exp_legacy/module/modules/gui/debug/model.lua b/exp_scenario/module/gui/debug/model.lua
similarity index 94%
rename from exp_legacy/module/modules/gui/debug/model.lua
rename to exp_scenario/module/gui/debug/model.lua
index 27d23d86..52ab850f 100644
--- a/exp_legacy/module/modules/gui/debug/model.lua
+++ b/exp_scenario/module/gui/debug/model.lua
@@ -1,4 +1,4 @@
-local Gui = require("modules.exp_legacy.utils.gui") --- @dep utils.gui
+local Gui = require("modules/exp_scenario/gui/debug/shim") --- @dep utils.gui
 local ExpUtil = require("modules/exp_util")
 
 local concat = table.concat
diff --git a/exp_legacy/module/modules/gui/debug/package_view.lua b/exp_scenario/module/gui/debug/package_view.lua
similarity index 96%
rename from exp_legacy/module/modules/gui/debug/package_view.lua
rename to exp_scenario/module/gui/debug/package_view.lua
index 689462c8..126242f4 100644
--- a/exp_legacy/module/modules/gui/debug/package_view.lua
+++ b/exp_scenario/module/gui/debug/package_view.lua
@@ -1,6 +1,6 @@
-local Gui = require("modules.exp_legacy.utils.gui") --- @dep utils.gui
+local Gui = require("modules/exp_scenario/gui/debug/shim") --- @dep utils.gui
 local Color = require("modules/exp_util/include/color")
-local Model = require("modules.exp_legacy.modules.gui.debug.model") --- @dep modules.gui.debug.model
+local Model = require("modules/exp_scenario/gui/debug/model") --- @dep modules.gui.debug.model
 
 local dump_function = Model.dump_function
 local loaded = _G.package.loaded
diff --git a/exp_legacy/module/modules/gui/debug/redmew_global_view.lua b/exp_scenario/module/gui/debug/redmew_global_view.lua
similarity index 95%
rename from exp_legacy/module/modules/gui/debug/redmew_global_view.lua
rename to exp_scenario/module/gui/debug/redmew_global_view.lua
index da5417c4..8e387479 100644
--- a/exp_legacy/module/modules/gui/debug/redmew_global_view.lua
+++ b/exp_scenario/module/gui/debug/redmew_global_view.lua
@@ -1,7 +1,7 @@
-local Gui = require("modules.exp_legacy.utils.gui") --- @dep utils.gui
+local Gui = require("modules/exp_scenario/gui/debug/shim") --- @dep utils.gui
 local Storage = require("modules/exp_util/storage")
 local Color = require("modules/exp_util/include/color")
-local Model = require("modules.exp_legacy.modules.gui.debug.model") --- @dep modules.gui.debug.model
+local Model = require("modules/exp_scenario/gui/debug/model") --- @dep modules.gui.debug.model
 
 local dump = Model.dump
 local dump_text = Model.dump_text
diff --git a/exp_legacy/module/utils/gui.lua b/exp_scenario/module/gui/debug/shim.lua
similarity index 97%
rename from exp_legacy/module/utils/gui.lua
rename to exp_scenario/module/gui/debug/shim.lua
index c20da522..9c3fda14 100644
--- a/exp_legacy/module/utils/gui.lua
+++ b/exp_scenario/module/gui/debug/shim.lua
@@ -1,5 +1,4 @@
 local Storage = require("modules/exp_util/storage")
-local Event = require("modules/exp_legacy/utils/event")
 local mod_gui = require "mod-gui"
 
 local Gui = {}
@@ -70,14 +69,15 @@ function Gui.clear(element)
     element.clear()
 end
 
+Gui.events = {}
 local function handler_factory(event_name)
     return function(element_name, handler)
-        Event.add(defines.events[event_name], function(event)
+        Gui.events[defines.events[event_name]] = function(event)
             if event.element and event.element.valid and event.element.name == element_name then
                 event.player = game.players[event.player_index]
                 handler(event)
             end
-        end)
+        end
     end
 end