diff --git a/Modules.Patterns/Modules/IModule.vb b/Modules.Patterns/IModule.vb
similarity index 100%
rename from Modules.Patterns/Modules/IModule.vb
rename to Modules.Patterns/IModule.vb
diff --git a/Modules.Patterns/Modules/BaseModule.vb b/Modules.Patterns/Modules/BaseModule.vb
index 172bc770..87ea4498 100644
--- a/Modules.Patterns/Modules/BaseModule.vb
+++ b/Modules.Patterns/Modules/BaseModule.vb
@@ -1,7 +1,7 @@
 Imports DigitalData.Modules.Logging
 Imports System.Text.RegularExpressions
 
-Namespace [PatternModule]
+Namespace Modules
     Public Class BaseModule
         Friend ReadOnly Logger As Logger
         Private ReadOnly MyRegex As Regex = New Regex("{#(\w+)#([\:\.\w\s_-]+)}+")
diff --git a/Modules.Patterns/Modules/Clipboard.vb b/Modules.Patterns/Modules/Clipboard.vb
index db25641e..ef9bba94 100644
--- a/Modules.Patterns/Modules/Clipboard.vb
+++ b/Modules.Patterns/Modules/Clipboard.vb
@@ -1,6 +1,6 @@
 Imports DigitalData.Modules.Logging
 
-Namespace [PatternModule]
+Namespace Modules
     Public Class Clipboard
         Inherits BaseModule
         Implements IModule
diff --git a/Modules.Patterns/Modules/Controls.vb b/Modules.Patterns/Modules/Controls.vb
index 1e9cb880..ff843eaa 100644
--- a/Modules.Patterns/Modules/Controls.vb
+++ b/Modules.Patterns/Modules/Controls.vb
@@ -2,7 +2,7 @@
 Imports DigitalData.Controls.LookupGrid
 Imports DigitalData.Modules.Logging
 
-Namespace [PatternModule]
+Namespace Modules
     ''' <summary>
     ''' Patterns for control values on a panel
     ''' </summary>
diff --git a/Modules.Patterns/Modules/IDB.vb b/Modules.Patterns/Modules/IDB.vb
index 5b95ff70..7ecf2770 100644
--- a/Modules.Patterns/Modules/IDB.vb
+++ b/Modules.Patterns/Modules/IDB.vb
@@ -2,7 +2,7 @@
 Imports DigitalData.Controls.LookupGrid
 Imports DigitalData.Modules.Logging
 
-Namespace [PatternModule]
+Namespace Modules
     ''' <summary>
     ''' Patterns for Windream Indicies
     ''' </summary>
diff --git a/Modules.Patterns/Modules/Internal.vb b/Modules.Patterns/Modules/Internal.vb
index 539e530f..205cfc50 100644
--- a/Modules.Patterns/Modules/Internal.vb
+++ b/Modules.Patterns/Modules/Internal.vb
@@ -1,6 +1,6 @@
 Imports DigitalData.Modules.Logging
 
-Namespace [PatternModule]
+Namespace Modules
     ''' <summary>
     ''' Simple patterns that only rely on .NET functions
     ''' </summary>
diff --git a/Modules.Patterns/Modules/User.vb b/Modules.Patterns/Modules/User.vb
index 6a823774..74315b94 100644
--- a/Modules.Patterns/Modules/User.vb
+++ b/Modules.Patterns/Modules/User.vb
@@ -1,6 +1,6 @@
 Imports DigitalData.Modules.Logging
 
-Namespace [PatternModule]
+Namespace Modules
     Public Class User
         Inherits BaseModule
         Implements IModule
diff --git a/Modules.Patterns/Modules/Windream.vb b/Modules.Patterns/Modules/Windream.vb
index f7557e2b..97ea3a02 100644
--- a/Modules.Patterns/Modules/Windream.vb
+++ b/Modules.Patterns/Modules/Windream.vb
@@ -2,7 +2,7 @@
 Imports DigitalData.Controls.LookupGrid
 Imports DigitalData.Modules.Logging
 
-Namespace [PatternModule]
+Namespace Modules
     ''' <summary>
     ''' Patterns for Windream Indicies
     ''' </summary>
diff --git a/Modules.Patterns/Patterns.vbproj b/Modules.Patterns/Patterns.vbproj
index 30f90ec2..891c1639 100644
--- a/Modules.Patterns/Patterns.vbproj
+++ b/Modules.Patterns/Patterns.vbproj
@@ -84,7 +84,7 @@
     <Compile Include="Modules\IDB.vb" />
     <Compile Include="Modules\Windream.vb" />
     <Compile Include="Modules\User.vb" />
-    <Compile Include="Modules\IModule.vb" />
+    <Compile Include="IModule.vb" />
     <Compile Include="Modules\Clipboard.vb" />
     <Compile Include="Modules\Controls.vb" />
     <Compile Include="Modules\Internal.vb" />
diff --git a/Modules.Patterns/Patterns2.vb b/Modules.Patterns/Patterns2.vb
index 27b55a86..8d65e35f 100644
--- a/Modules.Patterns/Patterns2.vb
+++ b/Modules.Patterns/Patterns2.vb
@@ -49,7 +49,7 @@ Public Class Patterns2
 
     Private ReadOnly LogConfig As LogConfig
     Private ReadOnly Logger As Logger
-    Private ReadOnly Base As PatternModule.BaseModule
+    Private ReadOnly Base As Modules.BaseModule
 
     Private ReadOnly ControlPanel As Panel
     Private ReadOnly IDBActive As Boolean
@@ -59,13 +59,13 @@ Public Class Patterns2
     Public Sub New(pLogConfig As LogConfig)
         LogConfig = pLogConfig
         Logger = pLogConfig.GetLogger()
-        Base = New PatternModule.BaseModule(LogConfig)
+        Base = New Modules.BaseModule(LogConfig)
 
         Modules.AddRange({
-            New PatternModule.Internal(LogConfig),
-            New PatternModule.Clipboard(LogConfig),
-            New PatternModule.Controls(LogConfig),
-            New PatternModule.User(LogConfig)
+            New Modules.Internal(LogConfig),
+            New Modules.Clipboard(LogConfig),
+            New Modules.Controls(LogConfig),
+            New Modules.User(LogConfig)
         })
     End Sub
 
@@ -94,7 +94,7 @@ Public Class Patterns2
     Public Function ReplaceUserValues(pInput As String, pUser As State.UserState) As String
         Dim oResult = pInput
 
-        Dim oModule = GetModule(Of PatternModule.User)()
+        Dim oModule = GetModule(Of Modules.User)()
         Dim oArgs = GetReplaceMapForModule(oModule, pUser:=pUser)
         oResult = DoReplaceForModule(oResult, oModule, oArgs)
 
@@ -104,7 +104,7 @@ Public Class Patterns2
     Public Function ReplaceControlValues(pInput As String, pPanel As Panel) As String
         Dim oResult = pInput
 
-        Dim oModule = GetModule(Of PatternModule.Controls)()
+        Dim oModule = GetModule(Of Modules.Controls)()
         Dim oArgs = GetReplaceMapForModule(oModule, pPanel:=pPanel)
         oResult = DoReplaceForModule(oResult, oModule, oArgs)
 
@@ -114,7 +114,7 @@ Public Class Patterns2
     Public Function ReplaceWindreamValues(pInput As String, pWMObject As WMObject) As String
         Dim oResult = pInput
 
-        Dim oModule = GetModule(Of PatternModule.Windream)()
+        Dim oModule = GetModule(Of Modules.Windream)()
         Dim oArgs = GetReplaceMapForModule(oModule, pWMObject:=pWMObject)
         oResult = DoReplaceForModule(oResult, oModule, oArgs)
 
@@ -124,11 +124,11 @@ Public Class Patterns2
     Public Function ReplaceInternalValues(pInput As String) As String
         Dim oResult = pInput
 
-        Dim oInternalModule = GetModule(Of PatternModule.Internal)()
+        Dim oInternalModule = GetModule(Of Modules.Internal)()
         Dim oInternalArgs = GetReplaceMapForModule(oInternalModule)
         oResult = DoReplaceForModule(oResult, oInternalModule, oInternalArgs)
 
-        Dim oClipboardModule = GetModule(Of PatternModule.Clipboard)()
+        Dim oClipboardModule = GetModule(Of Modules.Clipboard)()
         Dim oClipboardArgs = GetReplaceMapForModule(oClipboardModule)
         oResult = DoReplaceForModule(oResult, oClipboardModule, oClipboardArgs)
 
@@ -155,46 +155,46 @@ Public Class Patterns2
     Private Function GetReplaceMapForModule(pModule As IModule, Optional pPanel As Panel = Nothing, Optional pUser As State.UserState = Nothing, Optional pWMObject As WMObject = Nothing) As Dictionary(Of String, Object)
         Dim oArgs As New Dictionary(Of String, Object)
 
-        If TypeOf pModule Is PatternModule.Clipboard Then
+        If TypeOf pModule Is Modules.Clipboard Then
             Try
-                oArgs.Add(PatternModule.Clipboard.CLIP_VALUE_BOARD, My.Computer.Clipboard.GetText())
+                oArgs.Add(Patterns.Modules.Clipboard.CLIP_VALUE_BOARD, My.Computer.Clipboard.GetText())
             Catch ex As Exception
                 Logger.Error(ex)
             End Try
 
-        ElseIf TypeOf pModule Is PatternModule.Internal Then
+        ElseIf TypeOf pModule Is Modules.Internal Then
             Try
-                oArgs.Add(PatternModule.Internal.INT_VALUE_USERNAME, System.Environment.UserName)
-                oArgs.Add(PatternModule.Internal.INT_VALUE_MACHINE, System.Environment.MachineName)
-                oArgs.Add(PatternModule.Internal.INT_VALUE_DOMAIN, System.Environment.UserDomainName)
-                oArgs.Add(PatternModule.Internal.INT_VALUE_DATE, Now.ToShortDateString)
+                oArgs.Add(Patterns.Modules.Internal.INT_VALUE_USERNAME, System.Environment.UserName)
+                oArgs.Add(Patterns.Modules.Internal.INT_VALUE_MACHINE, System.Environment.MachineName)
+                oArgs.Add(Patterns.Modules.Internal.INT_VALUE_DOMAIN, System.Environment.UserDomainName)
+                oArgs.Add(Patterns.Modules.Internal.INT_VALUE_DATE, Now.ToShortDateString)
             Catch ex As Exception
                 Logger.Error(ex)
             End Try
 
-        ElseIf TypeOf pModule Is PatternModule.User Then
+        ElseIf TypeOf pModule Is Modules.User Then
             Try
-                oArgs.Add(PatternModule.User.USER_VALUE_EMAIL, pUser.Email)
-                oArgs.Add(PatternModule.User.USER_VALUE_LANGUAGE, pUser.Language)
-                oArgs.Add(PatternModule.User.USER_VALUE_PRENAME, pUser.GivenName)
-                oArgs.Add(PatternModule.User.USER_VALUE_SHORTNAME, pUser.ShortName)
-                oArgs.Add(PatternModule.User.USER_VALUE_SURNAME, pUser.Surname)
-                oArgs.Add(PatternModule.User.USER_VALUE_USER_ID, pUser.UserId)
-                oArgs.Add(PatternModule.User.USER_VALUE_USER_NAME, pUser.UserName)
+                oArgs.Add(Patterns.Modules.User.USER_VALUE_EMAIL, pUser.Email)
+                oArgs.Add(Patterns.Modules.User.USER_VALUE_LANGUAGE, pUser.Language)
+                oArgs.Add(Patterns.Modules.User.USER_VALUE_PRENAME, pUser.GivenName)
+                oArgs.Add(Patterns.Modules.User.USER_VALUE_SHORTNAME, pUser.ShortName)
+                oArgs.Add(Patterns.Modules.User.USER_VALUE_SURNAME, pUser.Surname)
+                oArgs.Add(Patterns.Modules.User.USER_VALUE_USER_ID, pUser.UserId)
+                oArgs.Add(Patterns.Modules.User.USER_VALUE_USER_NAME, pUser.UserName)
             Catch ex As Exception
                 Logger.Error(ex)
             End Try
 
-        ElseIf TypeOf pModule Is PatternModule.Controls Then
+        ElseIf TypeOf pModule Is Modules.Controls Then
             Try
-                oArgs.Add(PatternModule.Controls.CTRL_VALUE_PANEL, pPanel)
+                oArgs.Add(Patterns.Modules.Controls.CTRL_VALUE_PANEL, pPanel)
             Catch ex As Exception
                 Logger.Error(ex)
             End Try
 
-        ElseIf TypeOf pModule Is PatternModule.Windream Then
+        ElseIf TypeOf pModule Is Modules.Windream Then
             Try
-                oArgs.Add(PatternModule.Windream.WM_VALUE_DOCUMENT, pWMObject)
+                oArgs.Add(Patterns.Modules.Windream.WM_VALUE_DOCUMENT, pWMObject)
             Catch ex As Exception
                 Logger.Error(ex)
             End Try