diff --git a/Eve-O-Preview/Configuration/AppConfig.cs b/Eve-O-Preview/Configuration/Implementation/AppConfig.cs
similarity index 71%
rename from Eve-O-Preview/Configuration/AppConfig.cs
rename to Eve-O-Preview/Configuration/Implementation/AppConfig.cs
index c059d39..daa7de0 100644
--- a/Eve-O-Preview/Configuration/AppConfig.cs
+++ b/Eve-O-Preview/Configuration/Implementation/AppConfig.cs
@@ -1,4 +1,4 @@
-namespace EveOPreview.Configuration
+namespace EveOPreview.Configuration.Implementation
 {
 	class AppConfig : IAppConfig
 	{
diff --git a/Eve-O-Preview/Configuration/ConfigurationStorage.cs b/Eve-O-Preview/Configuration/Implementation/ConfigurationStorage.cs
similarity index 92%
rename from Eve-O-Preview/Configuration/ConfigurationStorage.cs
rename to Eve-O-Preview/Configuration/Implementation/ConfigurationStorage.cs
index 50a0663..e07ec8f 100644
--- a/Eve-O-Preview/Configuration/ConfigurationStorage.cs
+++ b/Eve-O-Preview/Configuration/Implementation/ConfigurationStorage.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using Newtonsoft.Json;
 
-namespace EveOPreview.Configuration
+namespace EveOPreview.Configuration.Implementation
 {
 	class ConfigurationStorage : IConfigurationStorage
 	{
diff --git a/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs b/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
index b22c926..eac17e9 100644
--- a/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
+++ b/Eve-O-Preview/Configuration/Implementation/ThumbnailConfiguration.cs
@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using Newtonsoft.Json;
 
-namespace EveOPreview.Configuration.Omplementation
+namespace EveOPreview.Configuration.Implementation
 {
 	sealed class ThumbnailConfiguration : IThumbnailConfiguration
 	{
diff --git a/Eve-O-Preview/Configuration/ClientLayout.cs b/Eve-O-Preview/Configuration/Interface/ClientLayout.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/ClientLayout.cs
rename to Eve-O-Preview/Configuration/Interface/ClientLayout.cs
diff --git a/Eve-O-Preview/Configuration/IAppConfig.cs b/Eve-O-Preview/Configuration/Interface/IAppConfig.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/IAppConfig.cs
rename to Eve-O-Preview/Configuration/Interface/IAppConfig.cs
diff --git a/Eve-O-Preview/Configuration/IConfigurationStorage.cs b/Eve-O-Preview/Configuration/Interface/IConfigurationStorage.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/IConfigurationStorage.cs
rename to Eve-O-Preview/Configuration/Interface/IConfigurationStorage.cs
diff --git a/Eve-O-Preview/Configuration/ZoomAnchor.cs b/Eve-O-Preview/Configuration/Interface/ZoomAnchor.cs
similarity index 100%
rename from Eve-O-Preview/Configuration/ZoomAnchor.cs
rename to Eve-O-Preview/Configuration/Interface/ZoomAnchor.cs
diff --git a/Eve-O-Preview/Eve-O-Preview.csproj b/Eve-O-Preview/Eve-O-Preview.csproj
index 2d0e212..abdecee 100644
--- a/Eve-O-Preview/Eve-O-Preview.csproj
+++ b/Eve-O-Preview/Eve-O-Preview.csproj
@@ -108,11 +108,11 @@
     <Compile Include="ApplicationBase\LightInjectContainer.cs" />
     <Compile Include="ApplicationBase\Presenter.cs" />
     <Compile Include="ApplicationBase\PresenterGeneric.cs" />
-    <Compile Include="Configuration\AppConfig.cs" />
-    <Compile Include="Configuration\ConfigurationStorage.cs" />
-    <Compile Include="Configuration\IAppConfig.cs" />
+    <Compile Include="Configuration\Implementation\AppConfig.cs" />
+    <Compile Include="Configuration\Implementation\ConfigurationStorage.cs" />
+    <Compile Include="Configuration\Interface\IAppConfig.cs" />
     <Compile Include="Configuration\Interface\IThumbnailConfiguration.cs" />
-    <Compile Include="Configuration\ZoomAnchor.cs" />
+    <Compile Include="Configuration\Interface\ZoomAnchor.cs" />
     <Compile Include="Mediator\Handlers\Configuration\SaveConfigurationHandler.cs" />
     <Compile Include="Mediator\Handlers\Thumbnails\ThumbnailFrameSettingsUpdatedHandler.cs" />
     <Compile Include="Mediator\Handlers\Thumbnails\ThumbnailConfiguredSizeUpdatedHandler.cs" />
@@ -143,7 +143,7 @@
     <Compile Include="Services\Interface\IWindowManager.cs" />
     <Compile Include="Services\Interop\MARGINS.cs" />
     <Compile Include="Services\Interop\RECT.cs" />
-    <Compile Include="Configuration\ClientLayout.cs" />
+    <Compile Include="Configuration\Interface\ClientLayout.cs" />
     <Compile Include="ApplicationBase\IPresenter.cs" />
     <Compile Include="Services\Implementation\WindowManager.cs" />
     <Compile Include="Services\Interop\User32NativeMethods.cs" />
@@ -167,7 +167,7 @@
     <Compile Include="View\Implementation\MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Configuration\IConfigurationStorage.cs" />
+    <Compile Include="Configuration\Interface\IConfigurationStorage.cs" />
     <Compile Include="View\Interface\IThumbnailView.cs" />
     <Compile Include="View\Implementation\ThumbnailViewFactory.cs" />
     <Compile Include="Services\Implementation\ThumbnailManager.cs" />