diff --git a/Config/database/energy-buffer.lua b/Config/database/energy-buffer.lua
deleted file mode 100644
index a85494f..0000000
--- a/Config/database/energy-buffer.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-local address = "3691f797-8297-4239-9963-66be089d5390"
-
-return address
diff --git a/Config/database/cleanroom.lua b/Configuration/Addresses/cleanroom.lua
similarity index 100%
rename from Config/database/cleanroom.lua
rename to Configuration/Addresses/cleanroom.lua
diff --git a/Configuration/Addresses/energy-buffers.lua b/Configuration/Addresses/energy-buffers.lua
new file mode 100644
index 0000000..18c235d
--- /dev/null
+++ b/Configuration/Addresses/energy-buffers.lua
@@ -0,0 +1,5 @@
+local addresses = {
+    batteryBuffer1 = "3691f797-8297-4239-9963-66be089d5390"
+}
+
+return addresses
diff --git a/Config/database/multi-blocks.lua b/Configuration/Addresses/multi-blocks.lua
similarity index 100%
rename from Config/database/multi-blocks.lua
rename to Configuration/Addresses/multi-blocks.lua
diff --git a/Config/colors.lua b/Configuration/colors.lua
similarity index 100%
rename from Config/colors.lua
rename to Configuration/colors.lua
diff --git a/Programs/monitor-system/src/domain/cleanroom/protect-recipes-usecase.lua b/Programs/monitor-system/src/domain/cleanroom/protect-recipes-usecase.lua
index 70c9b88..94a2c41 100755
--- a/Programs/monitor-system/src/domain/cleanroom/protect-recipes-usecase.lua
+++ b/Programs/monitor-system/src/domain/cleanroom/protect-recipes-usecase.lua
@@ -1,5 +1,5 @@
 -- Import section
-local alarm = require('api.sound.alarm')
+local alarm = require('alarm')
 --
 
 local function halt(machines)
diff --git a/Programs/monitor-system/src/domain/energy/get-energy-status-usecase.lua b/Programs/monitor-system/src/domain/energy/get-energy-status-usecase.lua
index 5a6ee5e..99bd835 100755
--- a/Programs/monitor-system/src/domain/energy/get-energy-status-usecase.lua
+++ b/Programs/monitor-system/src/domain/energy/get-energy-status-usecase.lua
@@ -1,6 +1,6 @@
 -- Import section
-local getConsumption = require("domain.energy.get-consumption-usecase")
-local getProduction = require("domain.energy.get-production-usecase")
+local getConsumption = require("get-consumption-usecase")
+local getProduction = require("get-production-usecase")
 --
 
 local function exec(energyProducers, energyBuffer)
diff --git a/Programs/monitor-system/src/init.lua b/Programs/monitor-system/src/init.lua
index 4da7768..1a7cb9b 100755
--- a/Programs/monitor-system/src/init.lua
+++ b/Programs/monitor-system/src/init.lua
@@ -24,7 +24,7 @@ local EBF11 = MultiBlock:new(multiBlockAddresses.EBF11)
 
 local multiblocks = {cleanroom, EBF11}
 
-local energyBuffer = EnergyProvider:new(energyBufferAddress)
+local energyBuffer = EnergyProvider:new(energyBufferAddress.batteryBuffer1)
 
 local energyProducers = {}