diff --git a/Libraries/Graphics/ARGraphics.lua b/Libraries/graphics/ARGraphics.lua
similarity index 100%
rename from Libraries/Graphics/ARGraphics.lua
rename to Libraries/graphics/ARGraphics.lua
diff --git a/Libraries/Graphics/ARWidgets.lua b/Libraries/graphics/ARWidgets.lua
similarity index 100%
rename from Libraries/Graphics/ARWidgets.lua
rename to Libraries/graphics/ARWidgets.lua
diff --git a/Libraries/Graphics/graphics.lua b/Libraries/graphics/graphics.lua
similarity index 100%
rename from Libraries/Graphics/graphics.lua
rename to Libraries/graphics/graphics.lua
diff --git a/Libraries/Graphics/gui.lua b/Libraries/graphics/gui.lua
similarity index 100%
rename from Libraries/Graphics/gui.lua
rename to Libraries/graphics/gui.lua
diff --git a/Libraries/Graphics/widgets.lua b/Libraries/graphics/widgets.lua
similarity index 100%
rename from Libraries/Graphics/widgets.lua
rename to Libraries/graphics/widgets.lua
diff --git a/Libraries/Network/network.lua b/Libraries/network/network.lua
similarity index 100%
rename from Libraries/Network/network.lua
rename to Libraries/network/network.lua
diff --git a/Libraries/Sound/play-tune.lua b/Libraries/sound/play-tune.lua
similarity index 100%
rename from Libraries/Sound/play-tune.lua
rename to Libraries/sound/play-tune.lua
diff --git a/Libraries/Utilities/inherits.lua b/Libraries/utils/inherits.lua
similarity index 100%
rename from Libraries/Utilities/inherits.lua
rename to Libraries/utils/inherits.lua
diff --git a/Libraries/Utilities/new.lua b/Libraries/utils/new.lua
similarity index 100%
rename from Libraries/Utilities/new.lua
rename to Libraries/utils/new.lua
diff --git a/Libraries/Utilities/parser.lua b/Libraries/utils/parser.lua
similarity index 100%
rename from Libraries/Utilities/parser.lua
rename to Libraries/utils/parser.lua
diff --git a/Libraries/Utilities/utility.lua b/Libraries/utils/utility.lua
similarity index 100%
rename from Libraries/Utilities/utility.lua
rename to Libraries/utils/utility.lua
diff --git a/Configuration/Addresses/cleanroom.lua b/Programs/config/addresses/cleanroom.lua
similarity index 100%
rename from Configuration/Addresses/cleanroom.lua
rename to Programs/config/addresses/cleanroom.lua
diff --git a/Configuration/Addresses/energy-buffers.lua b/Programs/config/addresses/energy-buffers.lua
similarity index 100%
rename from Configuration/Addresses/energy-buffers.lua
rename to Programs/config/addresses/energy-buffers.lua
diff --git a/Configuration/Addresses/multi-blocks.lua b/Programs/config/addresses/multi-blocks.lua
similarity index 100%
rename from Configuration/Addresses/multi-blocks.lua
rename to Programs/config/addresses/multi-blocks.lua
diff --git a/Configuration/colors.lua b/Programs/config/colors.lua
similarity index 100%
rename from Configuration/colors.lua
rename to Programs/config/colors.lua
diff --git a/Programs/monitor-system/src/data/datasource/energy-provider.lua b/Programs/monitor-system/data/datasource/energy-provider.lua
similarity index 89%
rename from Programs/monitor-system/src/data/datasource/energy-provider.lua
rename to Programs/monitor-system/data/datasource/energy-provider.lua
index 65d2d08..cbb2169 100755
--- a/Programs/monitor-system/src/data/datasource/energy-provider.lua
+++ b/Programs/monitor-system/data/datasource/energy-provider.lua
@@ -1,8 +1,8 @@
 -- Import section
-parser = require("parser")
-inherits = require("inherits")
-SingleBlock = require("single-block")
-local mock = require("mock-energy-provider")
+parser = require("utils.parser")
+inherits = require("utils.inherits")
+SingleBlock = require("data.datasource.single-block")
+local mock = require("data.mock.mock-energy-provider")
 --
 
 local EnergyProvider =
diff --git a/Programs/monitor-system/src/data/datasource/miner.lua b/Programs/monitor-system/data/datasource/miner.lua
similarity index 71%
rename from Programs/monitor-system/src/data/datasource/miner.lua
rename to Programs/monitor-system/data/datasource/miner.lua
index a55151f..342705d 100755
--- a/Programs/monitor-system/src/data/datasource/miner.lua
+++ b/Programs/monitor-system/data/datasource/miner.lua
@@ -1,8 +1,8 @@
 -- Import section
-parser = require("parser")
-inherits = require("inherits")
-SingleBlock = require("single-block")
-local mock = require("mock-multi-block")
+parser = require("utils.parser")
+inherits = require("utils.inherits")
+SingleBlock = require("data.datasource.single-block")
+local mock = require("data.mock.mock-multi-block")
 --
 
 local Miner =
diff --git a/Programs/monitor-system/src/data/datasource/multi-block.lua b/Programs/monitor-system/data/datasource/multi-block.lua
similarity index 73%
rename from Programs/monitor-system/src/data/datasource/multi-block.lua
rename to Programs/monitor-system/data/datasource/multi-block.lua
index 2e33b7f..5039d3b 100755
--- a/Programs/monitor-system/src/data/datasource/multi-block.lua
+++ b/Programs/monitor-system/data/datasource/multi-block.lua
@@ -1,8 +1,8 @@
 -- Import section
-parser = require("parser")
-inherits = require("inherits")
-SingleBlock = require("single-block")
-local mock = require("mock-multi-block")
+parser = require("utils.parser")
+inherits = require("utils.inherits")
+SingleBlock = require("data.datasource.single-block")
+local mock = require("data.mock.mock-multi-block")
 --
 
 local MultiBlock =
diff --git a/Programs/monitor-system/src/data/datasource/single-block.lua b/Programs/monitor-system/data/datasource/single-block.lua
similarity index 97%
rename from Programs/monitor-system/src/data/datasource/single-block.lua
rename to Programs/monitor-system/data/datasource/single-block.lua
index f459f3a..92ccd5c 100644
--- a/Programs/monitor-system/src/data/datasource/single-block.lua
+++ b/Programs/monitor-system/data/datasource/single-block.lua
@@ -1,6 +1,6 @@
 -- Import section
 component = require("component")
-local mock = require("mock-single-block")
+local mock = require("data.mock.mock-single-block")
 --
 
 local SingleBlock = {
diff --git a/Resources/Mock/miner.lua b/Programs/monitor-system/data/mock/miner.lua
similarity index 75%
rename from Resources/Mock/miner.lua
rename to Programs/monitor-system/data/mock/miner.lua
index f2ec18d..5410c51 100644
--- a/Resources/Mock/miner.lua
+++ b/Programs/monitor-system/data/mock/miner.lua
@@ -1,6 +1,6 @@
 -- Import section
-MockSingleBlock = require("mock-single-block")
-inherits = require("inherits")
+inherits = require("utils.inherits")
+MockSingleBlock = require("data.mock.mock-single-block")
 --
 
 local MockMiner =
diff --git a/Resources/Mock/mock-energy-provider.lua b/Programs/monitor-system/data/mock/mock-energy-provider.lua
similarity index 86%
rename from Resources/Mock/mock-energy-provider.lua
rename to Programs/monitor-system/data/mock/mock-energy-provider.lua
index 7a33b07..6f0e2da 100755
--- a/Resources/Mock/mock-energy-provider.lua
+++ b/Programs/monitor-system/data/mock/mock-energy-provider.lua
@@ -1,6 +1,6 @@
 -- Import section
-inherits = require("inherits")
-MockSingleBlock = require("mock-single-block")
+inherits = require("utils.inherits")
+MockSingleBlock = require("data.mock.mock-single-block")
 --
 
 local MockEnergyProvider =
diff --git a/Resources/Mock/mock-multi-block.lua b/Programs/monitor-system/data/mock/mock-multi-block.lua
similarity index 85%
rename from Resources/Mock/mock-multi-block.lua
rename to Programs/monitor-system/data/mock/mock-multi-block.lua
index 9023c89..a6ec44e 100644
--- a/Resources/Mock/mock-multi-block.lua
+++ b/Programs/monitor-system/data/mock/mock-multi-block.lua
@@ -1,6 +1,6 @@
 -- Import section
-MockSingleBlock = require("mock-single-block")
-inherits = require("inherits")
+inherits = require("utils.inherits")
+MockSingleBlock = require("data.mock.mock-single-block")
 --
 
 local MockMultiBlock =
diff --git a/Resources/Mock/mock-single-block.lua b/Programs/monitor-system/data/mock/mock-single-block.lua
similarity index 98%
rename from Resources/Mock/mock-single-block.lua
rename to Programs/monitor-system/data/mock/mock-single-block.lua
index ec000d7..2a780c8 100644
--- a/Resources/Mock/mock-single-block.lua
+++ b/Programs/monitor-system/data/mock/mock-single-block.lua
@@ -1,5 +1,5 @@
 -- Import section
-new = require("new")
+new = require("utils.new")
 --
 
 local MockSingleBlock = {
diff --git a/Programs/monitor-system/src/domain/cleanroom/protect-recipes-usecase.lua b/Programs/monitor-system/domain/cleanroom/protect-recipes-usecase.lua
similarity index 93%
rename from Programs/monitor-system/src/domain/cleanroom/protect-recipes-usecase.lua
rename to Programs/monitor-system/domain/cleanroom/protect-recipes-usecase.lua
index 94a2c41..015de44 100755
--- a/Programs/monitor-system/src/domain/cleanroom/protect-recipes-usecase.lua
+++ b/Programs/monitor-system/domain/cleanroom/protect-recipes-usecase.lua
@@ -1,5 +1,5 @@
 -- Import section
-local alarm = require('alarm')
+local alarm = require('resources.sound.alarm')
 --
 
 local function halt(machines)
diff --git a/Programs/monitor-system/domain/energy/get-consumption-usecase.lua b/Programs/monitor-system/domain/energy/get-consumption-usecase.lua
new file mode 100755
index 0000000..e69de29
diff --git a/Programs/monitor-system/src/domain/energy/get-energy-status-usecase.lua b/Programs/monitor-system/domain/energy/get-energy-status-usecase.lua
similarity index 80%
rename from Programs/monitor-system/src/domain/energy/get-energy-status-usecase.lua
rename to Programs/monitor-system/domain/energy/get-energy-status-usecase.lua
index 99bd835..5a6ee5e 100755
--- a/Programs/monitor-system/src/domain/energy/get-energy-status-usecase.lua
+++ b/Programs/monitor-system/domain/energy/get-energy-status-usecase.lua
@@ -1,6 +1,6 @@
 -- Import section
-local getConsumption = require("get-consumption-usecase")
-local getProduction = require("get-production-usecase")
+local getConsumption = require("domain.energy.get-consumption-usecase")
+local getProduction = require("domain.energy.get-production-usecase")
 --
 
 local function exec(energyProducers, energyBuffer)
diff --git a/Programs/monitor-system/domain/energy/get-production-usecase.lua b/Programs/monitor-system/domain/energy/get-production-usecase.lua
new file mode 100755
index 0000000..e69de29
diff --git a/Programs/monitor-system/domain/multiblock/get-status-usecase.lua b/Programs/monitor-system/domain/multiblock/get-status-usecase.lua
new file mode 100755
index 0000000..e69de29
diff --git a/Programs/monitor-system/src/init.lua b/Programs/monitor-system/init.lua
similarity index 77%
rename from Programs/monitor-system/src/init.lua
rename to Programs/monitor-system/init.lua
index 1a7cb9b..79b24b9 100755
--- a/Programs/monitor-system/src/init.lua
+++ b/Programs/monitor-system/init.lua
@@ -5,9 +5,9 @@ MultiBlock = require("data.datasource.multi-block")
 SingleBlock = require("data.datasource.single-block")
 EnergyProvider = require("data.datasource.energy-provider")
 
-local cleanroomAddresses = require("cleanroom")
-local multiBlockAddresses = require("multi-blocks")
-local energyBufferAddress = require("energy-buffer")
+local cleanroomAddresses = require("config.addresses.cleanroom")
+local multiBlockAddresses = require("config.addresses.multi-blocks")
+local energyBufferAddress = require("config.addresses.energy-buffers")
 
 local protectCleanroomRecipes = require("domain.cleanroom.protect-recipes-usecase")
 local getMultiblockStatuses = require("domain.multiblock.get-status-usecase")
@@ -31,8 +31,9 @@ local energyProducers = {}
 for i = 0, 100 do
     print(i)
     protectCleanroomRecipes(cleanroom, cleanroomMachines)
-    local multiblockStatuses = getMultiblockStatuses(multiblocks)
+    -- local multiblockStatuses = getMultiblockStatuses(multiblocks)
     local energyStatus = getEnergyStatus(energyProducers, energyBuffer)
     os.sleep(0)
     i = i + 1
 end
+require('resources.sound.zelda-secret')()
diff --git a/Resources/sound/alarm.lua b/Programs/monitor-system/resources/sound/alarm.lua
similarity index 90%
rename from Resources/sound/alarm.lua
rename to Programs/monitor-system/resources/sound/alarm.lua
index 3ea1d69..4c2ba4f 100755
--- a/Resources/sound/alarm.lua
+++ b/Programs/monitor-system/resources/sound/alarm.lua
@@ -1,5 +1,5 @@
 -- Import section
-local playTune = require("play-tune")
+local playTune = require("sound.play-tune")
 --
 
 local tune = {
diff --git a/Resources/sound/mario-one-up.lua b/Programs/monitor-system/resources/sound/mario-one-up.lua
similarity index 71%
rename from Resources/sound/mario-one-up.lua
rename to Programs/monitor-system/resources/sound/mario-one-up.lua
index 83d55e6..c777c8e 100755
--- a/Resources/sound/mario-one-up.lua
+++ b/Programs/monitor-system/resources/sound/mario-one-up.lua
@@ -1,5 +1,5 @@
 -- Import section
-local playTune = require("play-tune")
+local playTune = require("sound.play-tune")
 --
 
 local tune = {
diff --git a/Resources/sound/zelda-secret.lua b/Programs/monitor-system/resources/sound/zelda-secret.lua
similarity index 74%
rename from Resources/sound/zelda-secret.lua
rename to Programs/monitor-system/resources/sound/zelda-secret.lua
index e38416d..5b9442e 100755
--- a/Resources/sound/zelda-secret.lua
+++ b/Programs/monitor-system/resources/sound/zelda-secret.lua
@@ -1,5 +1,5 @@
 -- Import section
-local playTune = require('play-tune')
+local playTune = require('sound.play-tune')
 --
 
 local tune = {
diff --git a/Programs/setup.lua b/Programs/setup.lua
new file mode 100644
index 0000000..ef87f42
--- /dev/null
+++ b/Programs/setup.lua
@@ -0,0 +1,21 @@
+-- wget https://raw.githubusercontent.com/gordominossi/InfOS/master/Programs/setup.lua -f
+local shell = require("shell")
+
+local tarMan = "https://raw.githubusercontent.com/mpmxyz/ocprograms/master/usr/man/tar.man"
+local tarBin = "https://raw.githubusercontent.com/mpmxyz/ocprograms/master/home/bin/tar.lua"
+
+shell.setWorkingDirectory("/usr/man")
+shell.execute("wget " .. tarMan .. " -f")
+shell.setWorkingDirectory("/bin")
+shell.execute("wget " .. tarBin .. " -f")
+
+local InfOS = "https://github.com/gordominossi/InfOS/releases/download/v0/InfOS.tar"
+
+shell.setWorkingDirectory("/home")
+print("Updating InfOS")
+shell.execute("wget " .. InfOS .. " -f")
+shell.execute("tar -xf InfOS.tar")
+
+shell.setWorkingDirectory("/home/InfOS")
+shell.execute("ln -s Libraries/ ../lib")
+shell.execute("ln -s Programs/config Programs/monitor-system/config")