diff --git a/ZooFlow/Environment.vb b/ZooFlow/Environment.vb
index 768e1fed..0c7681dd 100644
--- a/ZooFlow/Environment.vb
+++ b/ZooFlow/Environment.vb
@@ -1,5 +1,4 @@
 Imports DigitalData.Modules.Database
-
 Public Class Environment
     Public Property User As New State.UserState
     Public Property Settings As New State.SettingsState
@@ -7,10 +6,4 @@ Public Class Environment
     Public Property Database As MSSQLServer
     Public Property DatabaseIDB As MSSQLServer
     Public Property Modules As New Dictionary(Of String, State.ModuleState)
-    Public Class MapFilehandler
-        Public CopyWMFile2Temp As Boolean = False
-        Public WM_SUFFIX As String = "\\WINDREAM\OBJECTS"
-        Public MAP_SHAREDRIVE As String = ""
-        Public MAP_BLACKLIST As String = ""
-    End Class
 End Class
diff --git a/ZooFlow/State/SettingsState.vb b/ZooFlow/State/SettingsState.vb
index 6a9e50e6..68a6f86a 100644
--- a/ZooFlow/State/SettingsState.vb
+++ b/ZooFlow/State/SettingsState.vb
@@ -1,5 +1,9 @@
 Namespace State
     Public Class SettingsState
         Public GdPictureKey As String = String.Empty
+        Public CopyWMFile2Temp As Boolean = False
+        Public WM_SUFFIX As String = "\\WINDREAM\OBJECTS"
+        Public MAP_SHAREDRIVE As String = ""
+        Public MAP_BLACKLIST As String = ""
     End Class
 End Namespace
\ No newline at end of file