diff --git a/Programs/monitor-system/api/gui/page/glasses.lua b/Programs/monitor-system/api/gui/glasses.lua
similarity index 100%
rename from Programs/monitor-system/api/gui/page/glasses.lua
rename to Programs/monitor-system/api/gui/glasses.lua
diff --git a/Programs/monitor-system/api/gui/page/help.lua b/Programs/monitor-system/api/gui/help.lua
similarity index 100%
rename from Programs/monitor-system/api/gui/page/help.lua
rename to Programs/monitor-system/api/gui/help.lua
diff --git a/Programs/monitor-system/api/gui/page/init.lua b/Programs/monitor-system/api/gui/init.lua
similarity index 96%
rename from Programs/monitor-system/api/gui/page/init.lua
rename to Programs/monitor-system/api/gui/init.lua
index e499caa..b875ee2 100644
--- a/Programs/monitor-system/api/gui/page/init.lua
+++ b/Programs/monitor-system/api/gui/init.lua
@@ -29,12 +29,12 @@ Widget = require("api.gui.widget")
 local page = {}
 
 local pages = {
-    glasses = require("api.gui.page.glasses"),
-    widgets = require("api.gui.page.widgets"),
-    help = require("api.gui.page.help"),
-    stock = require("api.gui.page.stock"),
-    notifications = require("api.gui.page.notifications"),
-    overview = require("api.gui.page.overview")
+    glasses = require("api.gui.glasses"),
+    widgets = require("api.gui.widgets"),
+    help = require("api.gui.help"),
+    stock = require("api.gui.stock"),
+    notifications = require("api.gui.notifications"),
+    overview = require("api.gui.overview")
 }
 pages[1] = pages.glasses
 pages[2] = pages.widgets
diff --git a/Programs/monitor-system/api/gui/page/notifications.lua b/Programs/monitor-system/api/gui/notifications.lua
similarity index 100%
rename from Programs/monitor-system/api/gui/page/notifications.lua
rename to Programs/monitor-system/api/gui/notifications.lua
diff --git a/Programs/monitor-system/api/gui/page/overview.lua b/Programs/monitor-system/api/gui/overview.lua
similarity index 100%
rename from Programs/monitor-system/api/gui/page/overview.lua
rename to Programs/monitor-system/api/gui/overview.lua
diff --git a/Programs/monitor-system/api/gui/page/stock.lua b/Programs/monitor-system/api/gui/stock.lua
similarity index 100%
rename from Programs/monitor-system/api/gui/page/stock.lua
rename to Programs/monitor-system/api/gui/stock.lua
diff --git a/Programs/monitor-system/api/gui/page/widgets.lua b/Programs/monitor-system/api/gui/widgets.lua
similarity index 100%
rename from Programs/monitor-system/api/gui/page/widgets.lua
rename to Programs/monitor-system/api/gui/widgets.lua
diff --git a/Programs/monitor-system/init.lua b/Programs/monitor-system/init.lua
index dbe316f..2b9fb8c 100755
--- a/Programs/monitor-system/init.lua
+++ b/Programs/monitor-system/init.lua
@@ -1,6 +1,6 @@
 -- Import section
 
-Page = require("api.gui.page")
+GUI = require("api.gui")
 
 -- MultiBlock = require("data.datasource.multi-block")
 -- SingleBlock = require("data.datasource.single-block")
@@ -62,15 +62,15 @@ end
 
 require("api.sound.zelda-secret")()
 --]]
-Page.setup(energyBufferAddresses.batteryBuffer1, multiBlockAddresses)
+GUI.setup(energyBufferAddresses.batteryBuffer1, multiBlockAddresses)
 
 while true do
-    Page.update()
+    GUI.update()
     os.sleep(0)
 end
 
 --[[
-Page = require("api.gui.page")
+Page = require("api.gui")
 Notifications = {}
 local components = {}
 local function getComponents()