diff --git a/VAR.Toolbox/Code/Bots/DummyBot.cs b/VAR.Toolbox/Code/Bots/DummyBot.cs
index e960b72..c06a90a 100644
--- a/VAR.Toolbox/Code/Bots/DummyBot.cs
+++ b/VAR.Toolbox/Code/Bots/DummyBot.cs
@@ -1,5 +1,5 @@
 using System.Drawing;
-using VAR.ScreenAutomation.Interfaces;
+using VAR.Toolbox.Code.Configuration;
 
 namespace VAR.Toolbox.Code.Bots
 {
diff --git a/VAR.Toolbox/Code/Bots/IAutomationBot.cs b/VAR.Toolbox/Code/Bots/IAutomationBot.cs
index 229fd86..08d8966 100644
--- a/VAR.Toolbox/Code/Bots/IAutomationBot.cs
+++ b/VAR.Toolbox/Code/Bots/IAutomationBot.cs
@@ -1,5 +1,5 @@
 using System.Drawing;
-using VAR.ScreenAutomation.Interfaces;
+using VAR.Toolbox.Code.Configuration;
 
 namespace VAR.Toolbox.Code.Bots
 {
diff --git a/VAR.Toolbox/Code/Bots/TetrisBot.cs b/VAR.Toolbox/Code/Bots/TetrisBot.cs
index d6c5b2e..64ad89a 100644
--- a/VAR.Toolbox/Code/Bots/TetrisBot.cs
+++ b/VAR.Toolbox/Code/Bots/TetrisBot.cs
@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Text;
-using VAR.ScreenAutomation.Code;
-using VAR.ScreenAutomation.Interfaces;
+using VAR.Toolbox.Code.Configuration;
 
 namespace VAR.Toolbox.Code.Bots
 {
diff --git a/VAR.Toolbox/Code/FileBackedConfiguration.cs b/VAR.Toolbox/Code/Configuration/FileBackedConfiguration.cs
similarity index 97%
rename from VAR.Toolbox/Code/FileBackedConfiguration.cs
rename to VAR.Toolbox/Code/Configuration/FileBackedConfiguration.cs
index 31d092b..5af6ce3 100644
--- a/VAR.Toolbox/Code/FileBackedConfiguration.cs
+++ b/VAR.Toolbox/Code/Configuration/FileBackedConfiguration.cs
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using VAR.ScreenAutomation.Interfaces;
 
-namespace VAR.ScreenAutomation.Code
+namespace VAR.Toolbox.Code.Configuration
 {
     public class FileBackedConfiguration : IConfiguration
     {
diff --git a/VAR.Toolbox/Code/IConfiguration.cs b/VAR.Toolbox/Code/Configuration/IConfiguration.cs
similarity index 91%
rename from VAR.Toolbox/Code/IConfiguration.cs
rename to VAR.Toolbox/Code/Configuration/IConfiguration.cs
index a394f27..4d370e8 100644
--- a/VAR.Toolbox/Code/IConfiguration.cs
+++ b/VAR.Toolbox/Code/Configuration/IConfiguration.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace VAR.ScreenAutomation.Interfaces
+namespace VAR.Toolbox.Code.Configuration
 {
     public interface IConfiguration
     {
diff --git a/VAR.Toolbox/Code/MemoryBackedConfiguration.cs b/VAR.Toolbox/Code/Configuration/MemoryBackedConfiguration.cs
similarity index 97%
rename from VAR.Toolbox/Code/MemoryBackedConfiguration.cs
rename to VAR.Toolbox/Code/Configuration/MemoryBackedConfiguration.cs
index a7ab978..ebc490f 100644
--- a/VAR.Toolbox/Code/MemoryBackedConfiguration.cs
+++ b/VAR.Toolbox/Code/Configuration/MemoryBackedConfiguration.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using VAR.ScreenAutomation.Interfaces;
 
-namespace VAR.ScreenAutomation.Code
+namespace VAR.Toolbox.Code.Configuration
 {
     public class MemoryBackedConfiguration : IConfiguration
     {
diff --git a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs
index 9c3d16c..5f9fcf0 100644
--- a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs
+++ b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows.Forms;
-using VAR.ScreenAutomation.Code;
+using VAR.Toolbox.Code.Configuration;
 
 namespace VAR.ScreenAutomation
 {
diff --git a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs
index 6a23f94..824f26d 100644
--- a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs
+++ b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs
@@ -4,9 +4,9 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using VAR.ScreenAutomation.Code;
-using VAR.ScreenAutomation.Interfaces;
 using VAR.Toolbox.Code;
 using VAR.Toolbox.Code.Bots;
+using VAR.Toolbox.Code.Configuration;
 using Mouse = VAR.ScreenAutomation.Code.Mouse;
 using Screenshoter = VAR.ScreenAutomation.Code.Screenshoter;
 
diff --git a/VAR.Toolbox/VAR.Toolbox.csproj b/VAR.Toolbox/VAR.Toolbox.csproj
index 8394250..a33dcef 100644
--- a/VAR.Toolbox/VAR.Toolbox.csproj
+++ b/VAR.Toolbox/VAR.Toolbox.csproj
@@ -82,12 +82,12 @@
     <Compile Include="Code\Bots\Screenshoter.cs" />
     <Compile Include="Code\Bots\TetrisBot.cs" />
     <Compile Include="Code\Bots\WindowHandling.cs" />
+    <Compile Include="Code\Configuration\FileBackedConfiguration.cs" />
+    <Compile Include="Code\Configuration\IConfiguration.cs" />
+    <Compile Include="Code\Configuration\MemoryBackedConfiguration.cs" />
     <Compile Include="Code\EventDispatcher.cs" />
-    <Compile Include="Code\FileBackedConfiguration.cs" />
     <Compile Include="Code\HexUtils.cs" />
-    <Compile Include="Code\IConfiguration.cs" />
     <Compile Include="Code\IEventListener.cs" />
-    <Compile Include="Code\MemoryBackedConfiguration.cs" />
     <Compile Include="Code\ProxyCmdExecutors\ProxyCmdExecutorWMIC.cs" />
     <Compile Include="Code\ReflectionUtils.cs" />
     <Compile Include="Code\TextCoders\TextCoderBase64Utf8.cs" />