diff --git a/ImporterShared/My Project/Resources.Designer.vb b/ImporterShared/My Project/Resources.Designer.vb
deleted file mode 100644
index e109cc5..0000000
--- a/ImporterShared/My Project/Resources.Designer.vb	
+++ /dev/null
@@ -1,62 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My.Resources
-    
-    'This class was auto-generated by the StronglyTypedResourceBuilder
-    'class via a tool like ResGen or Visual Studio.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'with the /str option, or rebuild your VS project.
-    '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
-    Friend Module Resources
-
-        Private resourceMan As Global.System.Resources.ResourceManager
-
-        Private resourceCulture As Global.System.Globalization.CultureInfo
-
-        '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
-            Get
-                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ImporterShared.Resources", GetType(Resources).Assembly)
-                    resourceMan = temp
-                End If
-                Return resourceMan
-            End Get
-        End Property
-
-        '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  resource lookups using this strongly typed resource class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Friend Property Culture() As Global.System.Globalization.CultureInfo
-            Get
-                Return resourceCulture
-            End Get
-            Set(ByVal value As Global.System.Globalization.CultureInfo)
-                resourceCulture = value
-            End Set
-        End Property
-    End Module
-End Namespace
diff --git a/EDIDocumentImport/App.config b/MultiTool.Form/App.config
similarity index 100%
rename from EDIDocumentImport/App.config
rename to MultiTool.Form/App.config
diff --git a/EDIDocumentImport/CREATE_DATABASE.sql b/MultiTool.Form/CREATE_DATABASE.sql
similarity index 100%
rename from EDIDocumentImport/CREATE_DATABASE.sql
rename to MultiTool.Form/CREATE_DATABASE.sql
diff --git a/EDIDocumentImport/Exceptions.vb b/MultiTool.Form/Exceptions.vb
similarity index 100%
rename from EDIDocumentImport/Exceptions.vb
rename to MultiTool.Form/Exceptions.vb
diff --git a/EDIDocumentImport/FormHelpers.vb b/MultiTool.Form/FormHelpers.vb
similarity index 100%
rename from EDIDocumentImport/FormHelpers.vb
rename to MultiTool.Form/FormHelpers.vb
diff --git a/EDIDocumentImport/GridLoader.vb b/MultiTool.Form/GridLoader.vb
similarity index 89%
rename from EDIDocumentImport/GridLoader.vb
rename to MultiTool.Form/GridLoader.vb
index 5a9d199..5446018 100644
--- a/EDIDocumentImport/GridLoader.vb
+++ b/MultiTool.Form/GridLoader.vb
@@ -2,7 +2,7 @@
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Logging
-Imports ImporterShared
+Imports MultiTool.Shared
 
 Public Class GridLoader
     Inherits BaseClass
@@ -68,16 +68,16 @@ Public Class GridLoader
 
     Private Function GetColumnType(pColumn As Schemas.Schema.Column)
         Select Case pColumn.DataType
-            Case ImporterShared.Constants.ColumnType.Boolean
+            Case MultiTool.Shared.Constants.ColumnType.Boolean
                 Return DevExpress.Data.UnboundColumnType.Boolean
 
-            Case ImporterShared.Constants.ColumnType.Date
+            Case MultiTool.Shared.Constants.ColumnType.Date
                 Return DevExpress.Data.UnboundColumnType.DateTime
 
-            Case ImporterShared.Constants.ColumnType.Integer
+            Case MultiTool.Shared.Constants.ColumnType.Integer
                 Return DevExpress.Data.UnboundColumnType.Integer
 
-            Case ImporterShared.Constants.ColumnType.Decimal
+            Case MultiTool.Shared.Constants.ColumnType.Decimal
                 Return DevExpress.Data.UnboundColumnType.Decimal
 
             Case Else
diff --git a/EDIDocumentImport/ImporterForm.vbproj b/MultiTool.Form/MultiTool.Form.vbproj
similarity index 97%
rename from EDIDocumentImport/ImporterForm.vbproj
rename to MultiTool.Form/MultiTool.Form.vbproj
index 89a1ab8..8446539 100644
--- a/EDIDocumentImport/ImporterForm.vbproj
+++ b/MultiTool.Form/MultiTool.Form.vbproj
@@ -6,9 +6,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{7AAEC958-955D-4F77-964C-38658684E424}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <StartupObject>ImporterForm.My.MyApplication</StartupObject>
-    <RootNamespace>ImporterForm</RootNamespace>
-    <AssemblyName>ImporterForm</AssemblyName>
+    <StartupObject>MultiTool.Form.My.MyApplication</StartupObject>
+    <RootNamespace>MultiTool.Form</RootNamespace>
+    <AssemblyName>MultiTool.Form</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@@ -22,7 +22,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>ImporterForm.xml</DocumentationFile>
+    <DocumentationFile>MultiTool.Form.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>ImporterForm.xml</DocumentationFile>
+    <DocumentationFile>MultiTool.Form.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -308,11 +308,10 @@
     <None Include="Resources\import.svg" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImporterShared\ImporterShared.vbproj">
+    <ProjectReference Include="..\MultiTool.Shared\MultiTool.Shared.vbproj">
       <Project>{dd1ac3b9-7595-4d3c-b9bb-97c46a480fa0}</Project>
-      <Name>ImporterShared</Name>
+      <Name>MultiTool.Shared</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
\ No newline at end of file
diff --git a/EDIDocumentImport/My Project/Application.Designer.vb b/MultiTool.Form/My Project/Application.Designer.vb
similarity index 96%
rename from EDIDocumentImport/My Project/Application.Designer.vb
rename to MultiTool.Form/My Project/Application.Designer.vb
index 9cc3b76..30d66b2 100644
--- a/EDIDocumentImport/My Project/Application.Designer.vb	
+++ b/MultiTool.Form/My Project/Application.Designer.vb	
@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.ImporterForm.frmImportMain
+            Me.MainForm = Global.MultiTool.Form.frmImportMain
         End Sub
     End Class
 End Namespace
diff --git a/EDIDocumentImport/My Project/Application.myapp b/MultiTool.Form/My Project/Application.myapp
similarity index 100%
rename from EDIDocumentImport/My Project/Application.myapp
rename to MultiTool.Form/My Project/Application.myapp
diff --git a/EDIDocumentImport/My Project/AssemblyInfo.vb b/MultiTool.Form/My Project/AssemblyInfo.vb
similarity index 100%
rename from EDIDocumentImport/My Project/AssemblyInfo.vb
rename to MultiTool.Form/My Project/AssemblyInfo.vb
diff --git a/EDIDocumentImport/My Project/Resources.Designer.vb b/MultiTool.Form/My Project/Resources.Designer.vb
similarity index 99%
rename from EDIDocumentImport/My Project/Resources.Designer.vb
rename to MultiTool.Form/My Project/Resources.Designer.vb
index ee4225d..816467b 100644
--- a/EDIDocumentImport/My Project/Resources.Designer.vb	
+++ b/MultiTool.Form/My Project/Resources.Designer.vb	
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ImporterForm.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Form.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
diff --git a/EDIDocumentImport/My Project/Resources.resx b/MultiTool.Form/My Project/Resources.resx
similarity index 100%
rename from EDIDocumentImport/My Project/Resources.resx
rename to MultiTool.Form/My Project/Resources.resx
diff --git a/EDIDocumentImport/My Project/Resources.resx.bak b/MultiTool.Form/My Project/Resources.resx.bak
similarity index 100%
rename from EDIDocumentImport/My Project/Resources.resx.bak
rename to MultiTool.Form/My Project/Resources.resx.bak
diff --git a/EDIDocumentImport/My Project/Settings.Designer.vb b/MultiTool.Form/My Project/Settings.Designer.vb
similarity index 94%
rename from EDIDocumentImport/My Project/Settings.Designer.vb
rename to MultiTool.Form/My Project/Settings.Designer.vb
index 54e58f6..7e06d24 100644
--- a/EDIDocumentImport/My Project/Settings.Designer.vb	
+++ b/MultiTool.Form/My Project/Settings.Designer.vb	
@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.ImporterForm.My.MySettings
+        Friend ReadOnly Property Settings() As Global.MultiTool.Form.My.MySettings
             Get
-                Return Global.ImporterForm.My.MySettings.Default
+                Return Global.MultiTool.Form.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/EDIDocumentImport/My Project/Settings.settings b/MultiTool.Form/My Project/Settings.settings
similarity index 100%
rename from EDIDocumentImport/My Project/Settings.settings
rename to MultiTool.Form/My Project/Settings.settings
diff --git a/EDIDocumentImport/My Project/licenses.licx b/MultiTool.Form/My Project/licenses.licx
similarity index 100%
rename from EDIDocumentImport/My Project/licenses.licx
rename to MultiTool.Form/My Project/licenses.licx
diff --git a/EDIDocumentImport/My Project/licenses.licx.bak b/MultiTool.Form/My Project/licenses.licx.bak
similarity index 100%
rename from EDIDocumentImport/My Project/licenses.licx.bak
rename to MultiTool.Form/My Project/licenses.licx.bak
diff --git a/EDIDocumentImport/Positions/Position.vb b/MultiTool.Form/Positions/Position.vb
similarity index 100%
rename from EDIDocumentImport/Positions/Position.vb
rename to MultiTool.Form/Positions/Position.vb
diff --git a/EDIDocumentImport/Positions/PositionColumns.vb b/MultiTool.Form/Positions/PositionColumns.vb
similarity index 100%
rename from EDIDocumentImport/Positions/PositionColumns.vb
rename to MultiTool.Form/Positions/PositionColumns.vb
diff --git a/EDIDocumentImport/Positions/PositionData.vb b/MultiTool.Form/Positions/PositionData.vb
similarity index 93%
rename from EDIDocumentImport/Positions/PositionData.vb
rename to MultiTool.Form/Positions/PositionData.vb
index 0d46c1a..a55638f 100644
--- a/EDIDocumentImport/Positions/PositionData.vb
+++ b/MultiTool.Form/Positions/PositionData.vb
@@ -1,10 +1,10 @@
 Imports DigitalData.Modules.Logging
-Imports ImporterForm.Positions
-Imports ImporterShared.Winline
-Imports ImporterShared.Schemas
+Imports MultiTool.Form.Positions
+Imports MultiTool.Shared.Winline
+Imports MultiTool.Shared.Schemas
 
 Public Class PositionData
-    Inherits ImporterShared.BaseClass
+    Inherits MultiTool.Shared.BaseClass
 
     Private Winline As Data
 
diff --git a/EDIDocumentImport/Positions/PositionGrid.vb b/MultiTool.Form/Positions/PositionGrid.vb
similarity index 94%
rename from EDIDocumentImport/Positions/PositionGrid.vb
rename to MultiTool.Form/Positions/PositionGrid.vb
index acda595..5f6d1ec 100644
--- a/EDIDocumentImport/Positions/PositionGrid.vb
+++ b/MultiTool.Form/Positions/PositionGrid.vb
@@ -1,7 +1,7 @@
 Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Grid
-Imports ImporterShared.Documents
-Imports ImporterForm.Positions
+Imports MultiTool.Shared.Documents
+Imports MultiTool.Form.Positions
 
 Namespace Positions
     Public Class PositionGrid
diff --git a/EDIDocumentImport/README.txt b/MultiTool.Form/README.txt
similarity index 100%
rename from EDIDocumentImport/README.txt
rename to MultiTool.Form/README.txt
diff --git a/EDIDocumentImport/Reports/OrderReport.Designer.vb b/MultiTool.Form/Reports/OrderReport.Designer.vb
similarity index 99%
rename from EDIDocumentImport/Reports/OrderReport.Designer.vb
rename to MultiTool.Form/Reports/OrderReport.Designer.vb
index 4180fba..83d32a1 100644
--- a/EDIDocumentImport/Reports/OrderReport.Designer.vb
+++ b/MultiTool.Form/Reports/OrderReport.Designer.vb
@@ -501,7 +501,7 @@ Partial Public Class OrderReport
         '
         'ObjectDataSource1
         '
-        Me.ObjectDataSource1.DataSource = GetType(ImporterShared.Schemas.Orders.ReportSource)
+        Me.ObjectDataSource1.DataSource = GetType(MultiTool.Shared.Schemas.Orders.ReportSource)
         Me.ObjectDataSource1.Name = "ObjectDataSource1"
         '
         'XrLabel12
diff --git a/EDIDocumentImport/Reports/OrderReport.resx b/MultiTool.Form/Reports/OrderReport.resx
similarity index 100%
rename from EDIDocumentImport/Reports/OrderReport.resx
rename to MultiTool.Form/Reports/OrderReport.resx
diff --git a/EDIDocumentImport/Reports/OrderReport.vb b/MultiTool.Form/Reports/OrderReport.vb
similarity index 100%
rename from EDIDocumentImport/Reports/OrderReport.vb
rename to MultiTool.Form/Reports/OrderReport.vb
diff --git a/EDIDocumentImport/Resources/actions_arrow4down.svg b/MultiTool.Form/Resources/actions_arrow4down.svg
similarity index 100%
rename from EDIDocumentImport/Resources/actions_arrow4down.svg
rename to MultiTool.Form/Resources/actions_arrow4down.svg
diff --git a/EDIDocumentImport/Resources/actions_checkcircled.svg b/MultiTool.Form/Resources/actions_checkcircled.svg
similarity index 100%
rename from EDIDocumentImport/Resources/actions_checkcircled.svg
rename to MultiTool.Form/Resources/actions_checkcircled.svg
diff --git a/EDIDocumentImport/Resources/actions_send.svg b/MultiTool.Form/Resources/actions_send.svg
similarity index 100%
rename from EDIDocumentImport/Resources/actions_send.svg
rename to MultiTool.Form/Resources/actions_send.svg
diff --git a/EDIDocumentImport/Resources/actions_send1.svg b/MultiTool.Form/Resources/actions_send1.svg
similarity index 100%
rename from EDIDocumentImport/Resources/actions_send1.svg
rename to MultiTool.Form/Resources/actions_send1.svg
diff --git a/EDIDocumentImport/Resources/bo_unknown.svg b/MultiTool.Form/Resources/bo_unknown.svg
similarity index 100%
rename from EDIDocumentImport/Resources/bo_unknown.svg
rename to MultiTool.Form/Resources/bo_unknown.svg
diff --git a/EDIDocumentImport/Resources/bo_unknown1.svg b/MultiTool.Form/Resources/bo_unknown1.svg
similarity index 100%
rename from EDIDocumentImport/Resources/bo_unknown1.svg
rename to MultiTool.Form/Resources/bo_unknown1.svg
diff --git a/EDIDocumentImport/Resources/bo_validation.svg b/MultiTool.Form/Resources/bo_validation.svg
similarity index 100%
rename from EDIDocumentImport/Resources/bo_validation.svg
rename to MultiTool.Form/Resources/bo_validation.svg
diff --git a/EDIDocumentImport/Resources/deletetablerows.svg b/MultiTool.Form/Resources/deletetablerows.svg
similarity index 100%
rename from EDIDocumentImport/Resources/deletetablerows.svg
rename to MultiTool.Form/Resources/deletetablerows.svg
diff --git a/EDIDocumentImport/Resources/export.svg b/MultiTool.Form/Resources/export.svg
similarity index 100%
rename from EDIDocumentImport/Resources/export.svg
rename to MultiTool.Form/Resources/export.svg
diff --git a/EDIDocumentImport/Resources/import.svg b/MultiTool.Form/Resources/import.svg
similarity index 100%
rename from EDIDocumentImport/Resources/import.svg
rename to MultiTool.Form/Resources/import.svg
diff --git a/EDIDocumentImport/Resources/itemtypechecked.svg b/MultiTool.Form/Resources/itemtypechecked.svg
similarity index 100%
rename from EDIDocumentImport/Resources/itemtypechecked.svg
rename to MultiTool.Form/Resources/itemtypechecked.svg
diff --git a/EDIDocumentImport/Resources/logical.svg b/MultiTool.Form/Resources/logical.svg
similarity index 100%
rename from EDIDocumentImport/Resources/logical.svg
rename to MultiTool.Form/Resources/logical.svg
diff --git a/EDIDocumentImport/Resources/mailmergepreview.svg b/MultiTool.Form/Resources/mailmergepreview.svg
similarity index 100%
rename from EDIDocumentImport/Resources/mailmergepreview.svg
rename to MultiTool.Form/Resources/mailmergepreview.svg
diff --git a/EDIDocumentImport/Resources/open.svg b/MultiTool.Form/Resources/open.svg
similarity index 100%
rename from EDIDocumentImport/Resources/open.svg
rename to MultiTool.Form/Resources/open.svg
diff --git a/EDIDocumentImport/Resources/open1.svg b/MultiTool.Form/Resources/open1.svg
similarity index 100%
rename from EDIDocumentImport/Resources/open1.svg
rename to MultiTool.Form/Resources/open1.svg
diff --git a/EDIDocumentImport/Resources/open2.svg b/MultiTool.Form/Resources/open2.svg
similarity index 100%
rename from EDIDocumentImport/Resources/open2.svg
rename to MultiTool.Form/Resources/open2.svg
diff --git a/EDIDocumentImport/Resources/open21.svg b/MultiTool.Form/Resources/open21.svg
similarity index 100%
rename from EDIDocumentImport/Resources/open21.svg
rename to MultiTool.Form/Resources/open21.svg
diff --git a/EDIDocumentImport/Resources/open22.svg b/MultiTool.Form/Resources/open22.svg
similarity index 100%
rename from EDIDocumentImport/Resources/open22.svg
rename to MultiTool.Form/Resources/open22.svg
diff --git a/EDIDocumentImport/Resources/pagesetup.svg b/MultiTool.Form/Resources/pagesetup.svg
similarity index 100%
rename from EDIDocumentImport/Resources/pagesetup.svg
rename to MultiTool.Form/Resources/pagesetup.svg
diff --git a/EDIDocumentImport/Resources/parameters.svg b/MultiTool.Form/Resources/parameters.svg
similarity index 100%
rename from EDIDocumentImport/Resources/parameters.svg
rename to MultiTool.Form/Resources/parameters.svg
diff --git a/EDIDocumentImport/Resources/paymentrefund.svg b/MultiTool.Form/Resources/paymentrefund.svg
similarity index 100%
rename from EDIDocumentImport/Resources/paymentrefund.svg
rename to MultiTool.Form/Resources/paymentrefund.svg
diff --git a/EDIDocumentImport/Resources/preview.svg b/MultiTool.Form/Resources/preview.svg
similarity index 100%
rename from EDIDocumentImport/Resources/preview.svg
rename to MultiTool.Form/Resources/preview.svg
diff --git a/EDIDocumentImport/Resources/redo.svg b/MultiTool.Form/Resources/redo.svg
similarity index 100%
rename from EDIDocumentImport/Resources/redo.svg
rename to MultiTool.Form/Resources/redo.svg
diff --git a/EDIDocumentImport/Resources/resetview.svg b/MultiTool.Form/Resources/resetview.svg
similarity index 100%
rename from EDIDocumentImport/Resources/resetview.svg
rename to MultiTool.Form/Resources/resetview.svg
diff --git a/EDIDocumentImport/Resources/rotatecounterclockwise.svg b/MultiTool.Form/Resources/rotatecounterclockwise.svg
similarity index 100%
rename from EDIDocumentImport/Resources/rotatecounterclockwise.svg
rename to MultiTool.Form/Resources/rotatecounterclockwise.svg
diff --git a/EDIDocumentImport/Resources/save.svg b/MultiTool.Form/Resources/save.svg
similarity index 100%
rename from EDIDocumentImport/Resources/save.svg
rename to MultiTool.Form/Resources/save.svg
diff --git a/EDIDocumentImport/Resources/showallfieldcodes.svg b/MultiTool.Form/Resources/showallfieldcodes.svg
similarity index 100%
rename from EDIDocumentImport/Resources/showallfieldcodes.svg
rename to MultiTool.Form/Resources/showallfieldcodes.svg
diff --git a/EDIDocumentImport/Resources/singlepageview.svg b/MultiTool.Form/Resources/singlepageview.svg
similarity index 100%
rename from EDIDocumentImport/Resources/singlepageview.svg
rename to MultiTool.Form/Resources/singlepageview.svg
diff --git a/EDIDocumentImport/Resources/tableproperties.svg b/MultiTool.Form/Resources/tableproperties.svg
similarity index 100%
rename from EDIDocumentImport/Resources/tableproperties.svg
rename to MultiTool.Form/Resources/tableproperties.svg
diff --git a/EDIDocumentImport/Resources/tilelabels.svg b/MultiTool.Form/Resources/tilelabels.svg
similarity index 100%
rename from EDIDocumentImport/Resources/tilelabels.svg
rename to MultiTool.Form/Resources/tilelabels.svg
diff --git a/EDIDocumentImport/Resources/togglefieldcodes.svg b/MultiTool.Form/Resources/togglefieldcodes.svg
similarity index 100%
rename from EDIDocumentImport/Resources/togglefieldcodes.svg
rename to MultiTool.Form/Resources/togglefieldcodes.svg
diff --git a/EDIDocumentImport/Resources/up.svg b/MultiTool.Form/Resources/up.svg
similarity index 100%
rename from EDIDocumentImport/Resources/up.svg
rename to MultiTool.Form/Resources/up.svg
diff --git a/EDIDocumentImport/Resources/wraptext.svg b/MultiTool.Form/Resources/wraptext.svg
similarity index 100%
rename from EDIDocumentImport/Resources/wraptext.svg
rename to MultiTool.Form/Resources/wraptext.svg
diff --git a/EDIDocumentImport/frmConfig.Designer.vb b/MultiTool.Form/frmConfig.Designer.vb
similarity index 99%
rename from EDIDocumentImport/frmConfig.Designer.vb
rename to MultiTool.Form/frmConfig.Designer.vb
index 0dfb22a..61b2b3a 100644
--- a/EDIDocumentImport/frmConfig.Designer.vb
+++ b/MultiTool.Form/frmConfig.Designer.vb
@@ -313,7 +313,7 @@ Partial Class frmConfig
         Me.Controls.Add(Me.barDockControlRight)
         Me.Controls.Add(Me.barDockControlBottom)
         Me.Controls.Add(Me.barDockControlTop)
-        Me.IconOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.bo_unknown1
+        Me.IconOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_unknown1
         Me.Name = "frmConfig"
         Me.Ribbon = Me.RibbonControl1
         Me.StatusBar = Me.RibbonStatusBar1
diff --git a/EDIDocumentImport/frmConfig.resx b/MultiTool.Form/frmConfig.resx
similarity index 100%
rename from EDIDocumentImport/frmConfig.resx
rename to MultiTool.Form/frmConfig.resx
diff --git a/EDIDocumentImport/frmConfig.vb b/MultiTool.Form/frmConfig.vb
similarity index 87%
rename from EDIDocumentImport/frmConfig.vb
rename to MultiTool.Form/frmConfig.vb
index 4be55ed..21a3af6 100644
--- a/EDIDocumentImport/frmConfig.vb
+++ b/MultiTool.Form/frmConfig.vb
@@ -1,9 +1,9 @@
 Imports DigitalData.Modules.Config
 
 Public Class frmConfig
-    Public Property ConfigManager As ConfigManager(Of ImporterShared.Config)
+    Public Property ConfigManager As ConfigManager(Of MultiTool.Shared.Config)
 
-    Private ReadOnly Property Config As ImporterShared.Config
+    Private ReadOnly Property Config As MultiTool.Shared.Config
         Get
             Return ConfigManager?.Config
         End Get
diff --git a/EDIDocumentImport/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb
similarity index 96%
rename from EDIDocumentImport/frmImportMain.Designer.vb
rename to MultiTool.Form/frmImportMain.Designer.vb
index 91112fa..3e85811 100644
--- a/EDIDocumentImport/frmImportMain.Designer.vb
+++ b/MultiTool.Form/frmImportMain.Designer.vb
@@ -127,35 +127,35 @@ Partial Class frmImportMain
         '
         Me.btnLoadFiles.Caption = "Dateien einlesen"
         Me.btnLoadFiles.Id = 3
-        Me.btnLoadFiles.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.export
+        Me.btnLoadFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.export
         Me.btnLoadFiles.Name = "btnLoadFiles"
         '
         'btnTransferFile
         '
         Me.btnTransferFile.Caption = "Aktuelle Datei übermitteln"
         Me.btnTransferFile.Id = 4
-        Me.btnTransferFile.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.actions_send1
+        Me.btnTransferFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send1
         Me.btnTransferFile.Name = "btnTransferFile"
         '
         'btnOpenInputDirectory
         '
         Me.btnOpenInputDirectory.Caption = "Eingangsverzeichnis öffnen"
         Me.btnOpenInputDirectory.Id = 6
-        Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.open22
+        Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open22
         Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory"
         '
         'btnOpenOutputDirectory
         '
         Me.btnOpenOutputDirectory.Caption = "Ausgangsverzeichnis öffnen"
         Me.btnOpenOutputDirectory.Id = 7
-        Me.btnOpenOutputDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.up
+        Me.btnOpenOutputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.up
         Me.btnOpenOutputDirectory.Name = "btnOpenOutputDirectory"
         '
         'btnOpenSchemaDirectory
         '
         Me.btnOpenSchemaDirectory.Caption = "Vorlagenverzeichnis öffnen"
         Me.btnOpenSchemaDirectory.Id = 9
-        Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.open1
+        Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open1
         Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory"
         '
         'btnReloadFile
@@ -163,7 +163,7 @@ Partial Class frmImportMain
         Me.btnReloadFile.Caption = "Aktuelle Datei neu laden"
         Me.btnReloadFile.Enabled = False
         Me.btnReloadFile.Id = 11
-        Me.btnReloadFile.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.rotatecounterclockwise
+        Me.btnReloadFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.rotatecounterclockwise
         Me.btnReloadFile.Name = "btnReloadFile"
         '
         'btnTransferAllFiles
@@ -171,7 +171,7 @@ Partial Class frmImportMain
         Me.btnTransferAllFiles.Caption = "Ausgewählte Dateien übermitteln"
         Me.btnTransferAllFiles.Enabled = False
         Me.btnTransferAllFiles.Id = 13
-        Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.actions_send
+        Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send
         Me.btnTransferAllFiles.Name = "btnTransferAllFiles"
         '
         'BarButtonItem1
@@ -179,7 +179,7 @@ Partial Class frmImportMain
         Me.BarButtonItem1.Caption = "Belegvorschau für aktuelle Datei anzeigen"
         Me.BarButtonItem1.Enabled = False
         Me.BarButtonItem1.Id = 14
-        Me.BarButtonItem1.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.mailmergepreview
+        Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.mailmergepreview
         Me.BarButtonItem1.Name = "BarButtonItem1"
         '
         'btnShowXml
@@ -187,21 +187,21 @@ Partial Class frmImportMain
         Me.btnShowXml.Caption = "XML-Datei anzeigen"
         Me.btnShowXml.Enabled = False
         Me.btnShowXml.Id = 15
-        Me.btnShowXml.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.togglefieldcodes
+        Me.btnShowXml.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.togglefieldcodes
         Me.btnShowXml.Name = "btnShowXml"
         '
         'btnOpenLogDirectory
         '
         Me.btnOpenLogDirectory.Caption = "Logverzeichnis öffnen"
         Me.btnOpenLogDirectory.Id = 16
-        Me.btnOpenLogDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.logical
+        Me.btnOpenLogDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical
         Me.btnOpenLogDirectory.Name = "btnOpenLogDirectory"
         '
         'btnOpenConfigDirectory
         '
         Me.btnOpenConfigDirectory.Caption = "Konfigurationsverzeichnis öffnen"
         Me.btnOpenConfigDirectory.Id = 17
-        Me.btnOpenConfigDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.parameters
+        Me.btnOpenConfigDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.parameters
         Me.btnOpenConfigDirectory.Name = "btnOpenConfigDirectory"
         '
         'txtCurrentFile
@@ -215,7 +215,7 @@ Partial Class frmImportMain
         '
         Me.btnConfig.Caption = "Konfiguration"
         Me.btnConfig.Id = 24
-        Me.btnConfig.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.bo_unknown
+        Me.btnConfig.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_unknown
         Me.btnConfig.Name = "btnConfig"
         '
         'RibbonPage1
diff --git a/EDIDocumentImport/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx
similarity index 100%
rename from EDIDocumentImport/frmImportMain.resx
rename to MultiTool.Form/frmImportMain.resx
diff --git a/EDIDocumentImport/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb
similarity index 98%
rename from EDIDocumentImport/frmImportMain.vb
rename to MultiTool.Form/frmImportMain.vb
index d70dedb..14505b4 100644
--- a/EDIDocumentImport/frmImportMain.vb
+++ b/MultiTool.Form/frmImportMain.vb
@@ -10,15 +10,15 @@ Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports ImporterShared
-Imports ImporterShared.Documents
-Imports ImporterShared.Schemas
-Imports ImporterShared.Winline
+Imports MultiTool.Shared
+Imports MultiTool.Shared.Documents
+Imports MultiTool.Shared.Schemas
+Imports MultiTool.Shared.Winline
 
 Public Class frmImportMain
     Private LogConfig As LogConfig
     Private Logger As Logger
-    Private ConfigManager As ConfigManager(Of ImporterShared.Config)
+    Private ConfigManager As ConfigManager(Of MultiTool.Shared.Config)
     Private Database As MSSQLServer
     Private Winline As Data
     Private FileEx As DigitalData.Modules.Filesystem.File
diff --git a/EDIDocumentImport/frmImportMain_old.Designer.vb b/MultiTool.Form/frmImportMain_old.Designer.vb
similarity index 97%
rename from EDIDocumentImport/frmImportMain_old.Designer.vb
rename to MultiTool.Form/frmImportMain_old.Designer.vb
index 891623c..2be1136 100644
--- a/EDIDocumentImport/frmImportMain_old.Designer.vb
+++ b/MultiTool.Form/frmImportMain_old.Designer.vb
@@ -102,7 +102,7 @@ Partial Class frmImportMain_old
         Me.GridViewPositions = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
         Me.RichEditXml = New DevExpress.XtraRichEdit.RichEditControl()
-        Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.ImporterForm.frmWaitForm), True, True)
+        Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True)
         CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -190,35 +190,35 @@ Partial Class frmImportMain_old
         '
         Me.BarButtonItem8.Caption = "Logverzeichnis öffnen"
         Me.BarButtonItem8.Id = 15
-        Me.BarButtonItem8.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.singlepageview
+        Me.BarButtonItem8.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.singlepageview
         Me.BarButtonItem8.Name = "BarButtonItem8"
         '
         'BarButtonItem3
         '
         Me.BarButtonItem3.Caption = "Konfigurationsverzeichnis öffnen"
         Me.BarButtonItem3.Id = 7
-        Me.BarButtonItem3.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.pagesetup
+        Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.pagesetup
         Me.BarButtonItem3.Name = "BarButtonItem3"
         '
         'BarButtonItem1
         '
         Me.BarButtonItem1.Caption = "Eingangsverzeichnis öffnen"
         Me.BarButtonItem1.Id = 5
-        Me.BarButtonItem1.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.open2
+        Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open2
         Me.BarButtonItem1.Name = "BarButtonItem1"
         '
         'BarButtonItem2
         '
         Me.BarButtonItem2.Caption = "Ausgangsverzeichnis öffnen"
         Me.BarButtonItem2.Id = 6
-        Me.BarButtonItem2.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.open
+        Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open
         Me.BarButtonItem2.Name = "BarButtonItem2"
         '
         'btnLoadDocuments
         '
         Me.btnLoadDocuments.Caption = "Dokumente einlesen"
         Me.btnLoadDocuments.Id = 1
-        Me.btnLoadDocuments.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.import
+        Me.btnLoadDocuments.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.import
         Me.btnLoadDocuments.Name = "btnLoadDocuments"
         '
         'txtFilesLoaded
@@ -231,21 +231,21 @@ Partial Class frmImportMain_old
         '
         Me.checkShowXml.Caption = "XML Datei anzeigen"
         Me.checkShowXml.Id = 9
-        Me.checkShowXml.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.showallfieldcodes
+        Me.checkShowXml.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.showallfieldcodes
         Me.checkShowXml.Name = "checkShowXml"
         '
         'BarButtonItem4
         '
         Me.BarButtonItem4.Caption = "Aktuelle Zeile übermitteln"
         Me.BarButtonItem4.Id = 10
-        Me.BarButtonItem4.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.bo_validation
+        Me.BarButtonItem4.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_validation
         Me.BarButtonItem4.Name = "BarButtonItem4"
         '
         'BarButtonItem5
         '
         Me.BarButtonItem5.Caption = "Markierte Zeilen übermitteln"
         Me.BarButtonItem5.Id = 11
-        Me.BarButtonItem5.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.itemtypechecked
+        Me.BarButtonItem5.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.itemtypechecked
         Me.BarButtonItem5.Name = "BarButtonItem5"
         '
         'txtVersion
@@ -259,21 +259,21 @@ Partial Class frmImportMain_old
         '
         Me.btnDeletePosition.Caption = "Zeile löschen"
         Me.btnDeletePosition.Id = 13
-        Me.btnDeletePosition.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.deletetablerows
+        Me.btnDeletePosition.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.deletetablerows
         Me.btnDeletePosition.Name = "btnDeletePosition"
         '
         'BarButtonItem7
         '
         Me.BarButtonItem7.Caption = "Artikel ersetzen"
         Me.BarButtonItem7.Id = 14
-        Me.BarButtonItem7.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.tableproperties
+        Me.BarButtonItem7.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.tableproperties
         Me.BarButtonItem7.Name = "BarButtonItem7"
         '
         'btnPreviewReport
         '
         Me.btnPreviewReport.Caption = "Belegvorschau für aktuelle Zeile öffnen"
         Me.btnPreviewReport.Id = 16
-        Me.btnPreviewReport.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.preview
+        Me.btnPreviewReport.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.preview
         Me.btnPreviewReport.Name = "btnPreviewReport"
         '
         'btnReportPreview
@@ -287,7 +287,7 @@ Partial Class frmImportMain_old
         Me.btnReloadDocument.Caption = "Aktuelles Dokument erneut laden"
         Me.btnReloadDocument.Enabled = False
         Me.btnReloadDocument.Id = 18
-        Me.btnReloadDocument.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.paymentrefund
+        Me.btnReloadDocument.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.paymentrefund
         Me.btnReloadDocument.Name = "btnReloadDocument"
         '
         'RibbonPage1
@@ -939,7 +939,7 @@ Partial Class frmImportMain_old
         Me.Controls.Add(Me.SplitContainerControl3)
         Me.Controls.Add(Me.RibbonStatusBar)
         Me.Controls.Add(Me.RibbonControl)
-        Me.IconOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.tilelabels
+        Me.IconOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.tilelabels
         Me.Name = "frmImportMain_old"
         Me.Ribbon = Me.RibbonControl
         Me.StatusBar = Me.RibbonStatusBar
diff --git a/EDIDocumentImport/frmImportMain_old.resx b/MultiTool.Form/frmImportMain_old.resx
similarity index 100%
rename from EDIDocumentImport/frmImportMain_old.resx
rename to MultiTool.Form/frmImportMain_old.resx
diff --git a/EDIDocumentImport/frmImportMain_old.vb b/MultiTool.Form/frmImportMain_old.vb
similarity index 98%
rename from EDIDocumentImport/frmImportMain_old.vb
rename to MultiTool.Form/frmImportMain_old.vb
index a57a691..e642bdc 100644
--- a/EDIDocumentImport/frmImportMain_old.vb
+++ b/MultiTool.Form/frmImportMain_old.vb
@@ -7,14 +7,14 @@ Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Config
 Imports DigitalData.Controls.SQLConfig
 Imports DigitalData.GUIs.Common
-Imports ImporterShared.Documents
-Imports ImporterShared.Winline
-Imports ImporterForm.Positions
+Imports MultiTool.Shared.Documents
+Imports MultiTool.Shared.Winline
+Imports MultiTool.Form.Positions
 
 Public Class frmImportMain_old
     Public LogConfig As LogConfig
     Public Logger As Logger
-    Public ConfigManager As ConfigManager(Of ImporterShared.Config)
+    Public ConfigManager As ConfigManager(Of [Shared].Config)
     Public Database As MSSQLServer
     Public DocumentLoader As DocumentLoader
     Public GridBuilder As GridBuilder
@@ -31,7 +31,7 @@ Public Class frmImportMain_old
             Logger = LogConfig.GetLogger()
             Logger.Info("EDI Document Importer, Version [{0}]", Application.ProductVersion)
 
-            ConfigManager = New ConfigManager(Of ImporterShared.Config)(LogConfig,
+            ConfigManager = New ConfigManager(Of MultiTool.Shared.Config)(LogConfig,
                 Application.UserAppDataPath,
                 Application.CommonAppDataPath,
                 Application.StartupPath)
diff --git a/EDIDocumentImport/frmMain.Designer.vb b/MultiTool.Form/frmMain.Designer.vb
similarity index 100%
rename from EDIDocumentImport/frmMain.Designer.vb
rename to MultiTool.Form/frmMain.Designer.vb
diff --git a/EDIDocumentImport/frmMain.resx b/MultiTool.Form/frmMain.resx
similarity index 100%
rename from EDIDocumentImport/frmMain.resx
rename to MultiTool.Form/frmMain.resx
diff --git a/EDIDocumentImport/frmMain.vb b/MultiTool.Form/frmMain.vb
similarity index 100%
rename from EDIDocumentImport/frmMain.vb
rename to MultiTool.Form/frmMain.vb
diff --git a/EDIDocumentImport/frmRowEditor.Designer.vb b/MultiTool.Form/frmRowEditor.Designer.vb
similarity index 97%
rename from EDIDocumentImport/frmRowEditor.Designer.vb
rename to MultiTool.Form/frmRowEditor.Designer.vb
index 833d77f..8469bbd 100644
--- a/EDIDocumentImport/frmRowEditor.Designer.vb
+++ b/MultiTool.Form/frmRowEditor.Designer.vb
@@ -58,21 +58,21 @@ Partial Class frmRowEditor
         '
         Me.btnSave.Caption = "Speichern und Schließen"
         Me.btnSave.Id = 1
-        Me.btnSave.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.save
+        Me.btnSave.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.save
         Me.btnSave.Name = "btnSave"
         '
         'btnApplyFromWinline
         '
         Me.btnApplyFromWinline.Caption = "Aus Winline übernehmen"
         Me.btnApplyFromWinline.Id = 2
-        Me.btnApplyFromWinline.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.actions_arrow4down
+        Me.btnApplyFromWinline.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_arrow4down
         Me.btnApplyFromWinline.Name = "btnApplyFromWinline"
         '
         'btnApplyFromOriginal
         '
         Me.btnApplyFromOriginal.Caption = "Auf Originalwert setzen"
         Me.btnApplyFromOriginal.Id = 3
-        Me.btnApplyFromOriginal.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.redo
+        Me.btnApplyFromOriginal.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.redo
         Me.btnApplyFromOriginal.Name = "btnApplyFromOriginal"
         '
         'RibbonPage1
diff --git a/EDIDocumentImport/frmRowEditor.resx b/MultiTool.Form/frmRowEditor.resx
similarity index 100%
rename from EDIDocumentImport/frmRowEditor.resx
rename to MultiTool.Form/frmRowEditor.resx
diff --git a/EDIDocumentImport/frmRowEditor.vb b/MultiTool.Form/frmRowEditor.vb
similarity index 96%
rename from EDIDocumentImport/frmRowEditor.vb
rename to MultiTool.Form/frmRowEditor.vb
index 63571f1..c1dc841 100644
--- a/EDIDocumentImport/frmRowEditor.vb
+++ b/MultiTool.Form/frmRowEditor.vb
@@ -1,10 +1,10 @@
 Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraVerticalGrid.Rows
-Imports ImporterShared.Documents
-Imports ImporterShared.DocumentRow
+Imports MultiTool.Shared.Documents
+Imports MultiTool.Shared.DocumentRow
 Imports DevExpress.XtraEditors.Repository
-Imports ImporterShared.Winline
+Imports MultiTool.Shared.Winline
 Imports DigitalData.Modules.Language
 Imports DevExpress.XtraEditors.Controls
 Imports System.Globalization
@@ -14,7 +14,7 @@ Public Class frmRowEditor
     Private ReadOnly _Columns As List(Of String)
     Private ReadOnly _DataTable As New DataTable
     Private ReadOnly _Accounts As List(Of Account)
-    Private ReadOnly _DocumentRow As ImporterShared.DocumentRow
+    Private ReadOnly _DocumentRow As MultiTool.Shared.DocumentRow
 
     Private ReadOnly DatePicker As New RepositoryItemDateEdit
     Private ReadOnly MultilineEditor As New RepositoryItemMemoEdit
@@ -27,13 +27,13 @@ Public Class frmRowEditor
     Private Const COL_VALUE_EXTERNAL = "VALUE_EXTERNAL"
     Private Const COL_VALUE_FINAL = "VALUE_FINAL"
 
-    Public ReadOnly Property DocumentRow As ImporterShared.DocumentRow
+    Public ReadOnly Property DocumentRow As MultiTool.Shared.DocumentRow
         Get
             Return _DocumentRow
         End Get
     End Property
 
-    Public Sub New(pColumns As List(Of String), pDocumentRow As ImporterShared.DocumentRow, pAccounts As List(Of Account))
+    Public Sub New(pColumns As List(Of String), pDocumentRow As MultiTool.Shared.DocumentRow, pAccounts As List(Of Account))
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
diff --git a/EDIDocumentImport/frmWaitForm.Designer.vb b/MultiTool.Form/frmWaitForm.Designer.vb
similarity index 100%
rename from EDIDocumentImport/frmWaitForm.Designer.vb
rename to MultiTool.Form/frmWaitForm.Designer.vb
diff --git a/EDIDocumentImport/frmWaitForm.resx b/MultiTool.Form/frmWaitForm.resx
similarity index 100%
rename from EDIDocumentImport/frmWaitForm.resx
rename to MultiTool.Form/frmWaitForm.resx
diff --git a/EDIDocumentImport/frmWaitForm.vb b/MultiTool.Form/frmWaitForm.vb
similarity index 100%
rename from EDIDocumentImport/frmWaitForm.vb
rename to MultiTool.Form/frmWaitForm.vb
diff --git a/EDIDocumentImport/frmXmlEditor.Designer.vb b/MultiTool.Form/frmXmlEditor.Designer.vb
similarity index 100%
rename from EDIDocumentImport/frmXmlEditor.Designer.vb
rename to MultiTool.Form/frmXmlEditor.Designer.vb
diff --git a/EDIDocumentImport/frmXmlEditor.resx b/MultiTool.Form/frmXmlEditor.resx
similarity index 100%
rename from EDIDocumentImport/frmXmlEditor.resx
rename to MultiTool.Form/frmXmlEditor.resx
diff --git a/EDIDocumentImport/frmXmlEditor.vb b/MultiTool.Form/frmXmlEditor.vb
similarity index 100%
rename from EDIDocumentImport/frmXmlEditor.vb
rename to MultiTool.Form/frmXmlEditor.vb
diff --git a/EDIDocumentImport/packages.config b/MultiTool.Form/packages.config
similarity index 100%
rename from EDIDocumentImport/packages.config
rename to MultiTool.Form/packages.config
diff --git a/ImporterShared/BaseClass.vb b/MultiTool.Shared/BaseClass.vb
similarity index 100%
rename from ImporterShared/BaseClass.vb
rename to MultiTool.Shared/BaseClass.vb
diff --git a/ImporterShared/Config.vb b/MultiTool.Shared/Config.vb
similarity index 100%
rename from ImporterShared/Config.vb
rename to MultiTool.Shared/Config.vb
diff --git a/ImporterShared/Constants.vb b/MultiTool.Shared/Constants.vb
similarity index 100%
rename from ImporterShared/Constants.vb
rename to MultiTool.Shared/Constants.vb
diff --git a/ImporterShared/Documents/Document.vb b/MultiTool.Shared/Documents/Document.vb
similarity index 96%
rename from ImporterShared/Documents/Document.vb
rename to MultiTool.Shared/Documents/Document.vb
index d081d99..bcaa49f 100644
--- a/ImporterShared/Documents/Document.vb
+++ b/MultiTool.Shared/Documents/Document.vb
@@ -1,6 +1,6 @@
 Imports System.IO
-Imports ImporterShared.Schemas
-Imports ImporterShared.Winline
+Imports MultiTool.Shared.Schemas
+Imports MultiTool.Shared.Winline
 
 Namespace Documents
     Public Class Document
diff --git a/ImporterShared/Documents/DocumentLoader.vb b/MultiTool.Shared/Documents/DocumentLoader.vb
similarity index 99%
rename from ImporterShared/Documents/DocumentLoader.vb
rename to MultiTool.Shared/Documents/DocumentLoader.vb
index 9e52b20..387df7c 100644
--- a/ImporterShared/Documents/DocumentLoader.vb
+++ b/MultiTool.Shared/Documents/DocumentLoader.vb
@@ -1,8 +1,8 @@
 Imports System.Globalization
 Imports System.IO
 Imports DigitalData.Modules.Logging
-Imports ImporterShared.Schemas
-Imports ImporterShared.Winline
+Imports MultiTool.Shared.Schemas
+Imports MultiTool.Shared.Winline
 
 Namespace Documents
     Public Class DocumentLoader
diff --git a/ImporterShared/Documents/DocumentMatch.vb b/MultiTool.Shared/Documents/DocumentMatch.vb
similarity index 100%
rename from ImporterShared/Documents/DocumentMatch.vb
rename to MultiTool.Shared/Documents/DocumentMatch.vb
diff --git a/ImporterShared/Documents/DocumentRow.vb b/MultiTool.Shared/Documents/DocumentRow.vb
similarity index 100%
rename from ImporterShared/Documents/DocumentRow.vb
rename to MultiTool.Shared/Documents/DocumentRow.vb
diff --git a/ImporterShared/Documents/DocumentType.vb b/MultiTool.Shared/Documents/DocumentType.vb
similarity index 100%
rename from ImporterShared/Documents/DocumentType.vb
rename to MultiTool.Shared/Documents/DocumentType.vb
diff --git a/ImporterShared/Exceptions.vb b/MultiTool.Shared/Exceptions.vb
similarity index 100%
rename from ImporterShared/Exceptions.vb
rename to MultiTool.Shared/Exceptions.vb
diff --git a/ImporterShared/IDictionaryEx.vb b/MultiTool.Shared/IDictionaryEx.vb
similarity index 100%
rename from ImporterShared/IDictionaryEx.vb
rename to MultiTool.Shared/IDictionaryEx.vb
diff --git a/ImporterShared/IEnumerableEx.vb b/MultiTool.Shared/IEnumerableEx.vb
similarity index 100%
rename from ImporterShared/IEnumerableEx.vb
rename to MultiTool.Shared/IEnumerableEx.vb
diff --git a/ImporterShared/ImporterShared.vbproj.bak b/MultiTool.Shared/ImporterShared.vbproj.bak
similarity index 100%
rename from ImporterShared/ImporterShared.vbproj.bak
rename to MultiTool.Shared/ImporterShared.vbproj.bak
diff --git a/ImporterShared/Mapper.vb b/MultiTool.Shared/Mapper.vb
similarity index 100%
rename from ImporterShared/Mapper.vb
rename to MultiTool.Shared/Mapper.vb
diff --git a/ImporterShared/ImporterShared.vbproj b/MultiTool.Shared/MultiTool.Shared.vbproj
similarity index 96%
rename from ImporterShared/ImporterShared.vbproj
rename to MultiTool.Shared/MultiTool.Shared.vbproj
index d4907f3..45e17cf 100644
--- a/ImporterShared/ImporterShared.vbproj
+++ b/MultiTool.Shared/MultiTool.Shared.vbproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>ImporterShared</RootNamespace>
-    <AssemblyName>ImporterShared</AssemblyName>
+    <RootNamespace>MultiTool.Shared</RootNamespace>
+    <AssemblyName>MultiTool.Shared</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@@ -19,7 +19,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>ImporterShared.xml</DocumentationFile>
+    <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -28,7 +28,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>ImporterShared.xml</DocumentationFile>
+    <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -107,6 +107,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
diff --git a/ImporterShared/My Project/Application.Designer.vb b/MultiTool.Shared/My Project/Application.Designer.vb
similarity index 51%
rename from ImporterShared/My Project/Application.Designer.vb
rename to MultiTool.Shared/My Project/Application.Designer.vb
index 88dd01c..8ab460b 100644
--- a/ImporterShared/My Project/Application.Designer.vb	
+++ b/MultiTool.Shared/My Project/Application.Designer.vb	
@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
diff --git a/ImporterShared/My Project/Application.myapp b/MultiTool.Shared/My Project/Application.myapp
similarity index 100%
rename from ImporterShared/My Project/Application.myapp
rename to MultiTool.Shared/My Project/Application.myapp
diff --git a/ImporterShared/My Project/AssemblyInfo.vb b/MultiTool.Shared/My Project/AssemblyInfo.vb
similarity index 87%
rename from ImporterShared/My Project/AssemblyInfo.vb
rename to MultiTool.Shared/My Project/AssemblyInfo.vb
index e943572..cf48350 100644
--- a/ImporterShared/My Project/AssemblyInfo.vb	
+++ b/MultiTool.Shared/My Project/AssemblyInfo.vb	
@@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("ImporterShared")>
+<Assembly: AssemblyTitle("MultiTool.Shared")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("ImporterShared")>
-<Assembly: AssemblyCopyright("Copyright ©  2021")>
+<Assembly: AssemblyProduct("MultiTool.Shared")>
+<Assembly: AssemblyCopyright("Copyright © 2021")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
diff --git a/MultiTool.Shared/My Project/Resources.Designer.vb b/MultiTool.Shared/My Project/Resources.Designer.vb
new file mode 100644
index 0000000..2a57fc0
--- /dev/null
+++ b/MultiTool.Shared/My Project/Resources.Designer.vb	
@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+
+Namespace My.Resources
+    
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    '''<summary>
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Shared.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace
diff --git a/ImporterShared/My Project/Resources.resx b/MultiTool.Shared/My Project/Resources.resx
similarity index 100%
rename from ImporterShared/My Project/Resources.resx
rename to MultiTool.Shared/My Project/Resources.resx
diff --git a/ImporterShared/My Project/Settings.Designer.vb b/MultiTool.Shared/My Project/Settings.Designer.vb
similarity index 50%
rename from ImporterShared/My Project/Settings.Designer.vb
rename to MultiTool.Shared/My Project/Settings.Designer.vb
index 3ec5544..fc42fb7 100644
--- a/ImporterShared/My Project/Settings.Designer.vb	
+++ b/MultiTool.Shared/My Project/Settings.Designer.vb	
@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -13,42 +13,42 @@ Option Explicit On
 
 
 Namespace My
-
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
-
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
-
-#Region "My.Settings Auto-Save Functionality"
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "Automatische My.Settings-Speicherfunktion"
 #If _MyType = "WindowsForms" Then
-        Private Shared addedHandler As Boolean
+    Private Shared addedHandler As Boolean
 
-        Private Shared addedHandlerLockObject As New Object
+    Private Shared addedHandlerLockObject As New Object
 
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
-            If My.Application.SaveMySettingsOnExit Then
-                My.Settings.Save()
-            End If
-        End Sub
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
 #End If
 #End Region
-
+        
         Public Shared ReadOnly Property [Default]() As MySettings
             Get
-
+                
 #If _MyType = "WindowsForms" Then
-                   If Not addedHandler Then
-                        SyncLock addedHandlerLockObject
-                            If Not addedHandler Then
-                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
-                                addedHandler = True
-                            End If
-                        End SyncLock
-                    End If
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
 #End If
                 Return defaultInstance
             End Get
@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.ImporterShared.My.MySettings
+        Friend ReadOnly Property Settings() As Global.MultiTool.[Shared].My.MySettings
             Get
-                Return Global.ImporterShared.My.MySettings.Default
+                Return Global.MultiTool.[Shared].My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/ImporterShared/My Project/Settings.settings b/MultiTool.Shared/My Project/Settings.settings
similarity index 100%
rename from ImporterShared/My Project/Settings.settings
rename to MultiTool.Shared/My Project/Settings.settings
diff --git a/ImporterShared/Schemas/BaseSchema.vb b/MultiTool.Shared/Schemas/BaseSchema.vb
similarity index 100%
rename from ImporterShared/Schemas/BaseSchema.vb
rename to MultiTool.Shared/Schemas/BaseSchema.vb
diff --git a/ImporterShared/Schemas/Orders/Helpers.vb b/MultiTool.Shared/Schemas/Orders/Helpers.vb
similarity index 100%
rename from ImporterShared/Schemas/Orders/Helpers.vb
rename to MultiTool.Shared/Schemas/Orders/Helpers.vb
diff --git a/ImporterShared/Schemas/Orders/Input.vb b/MultiTool.Shared/Schemas/Orders/Input.vb
similarity index 100%
rename from ImporterShared/Schemas/Orders/Input.vb
rename to MultiTool.Shared/Schemas/Orders/Input.vb
diff --git a/ImporterShared/Schemas/Orders/OrderSchema.vb b/MultiTool.Shared/Schemas/Orders/OrderSchema.vb
similarity index 100%
rename from ImporterShared/Schemas/Orders/OrderSchema.vb
rename to MultiTool.Shared/Schemas/Orders/OrderSchema.vb
diff --git a/ImporterShared/Schemas/Orders/ReportSource.vb b/MultiTool.Shared/Schemas/Orders/ReportSource.vb
similarity index 100%
rename from ImporterShared/Schemas/Orders/ReportSource.vb
rename to MultiTool.Shared/Schemas/Orders/ReportSource.vb
diff --git a/ImporterShared/Schemas/Response.vb b/MultiTool.Shared/Schemas/Response.vb
similarity index 100%
rename from ImporterShared/Schemas/Response.vb
rename to MultiTool.Shared/Schemas/Response.vb
diff --git a/ImporterShared/Schemas/Schema.vb b/MultiTool.Shared/Schemas/Schema.vb
similarity index 100%
rename from ImporterShared/Schemas/Schema.vb
rename to MultiTool.Shared/Schemas/Schema.vb
diff --git a/ImporterShared/Schemas/SchemaLoader.vb b/MultiTool.Shared/Schemas/SchemaLoader.vb
similarity index 100%
rename from ImporterShared/Schemas/SchemaLoader.vb
rename to MultiTool.Shared/Schemas/SchemaLoader.vb
diff --git a/ImporterShared/Serializer.vb b/MultiTool.Shared/Serializer.vb
similarity index 100%
rename from ImporterShared/Serializer.vb
rename to MultiTool.Shared/Serializer.vb
diff --git a/ImporterShared/Winline/Configuration.vb b/MultiTool.Shared/Winline/Configuration.vb
similarity index 100%
rename from ImporterShared/Winline/Configuration.vb
rename to MultiTool.Shared/Winline/Configuration.vb
diff --git a/ImporterShared/Winline/Data.vb b/MultiTool.Shared/Winline/Data.vb
similarity index 99%
rename from ImporterShared/Winline/Data.vb
rename to MultiTool.Shared/Winline/Data.vb
index dca7603..a634ff8 100644
--- a/ImporterShared/Winline/Data.vb
+++ b/MultiTool.Shared/Winline/Data.vb
@@ -1,7 +1,7 @@
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.Database
-Imports ImporterShared
+Imports MultiTool.Shared
 Imports System.Text.RegularExpressions
 
 
diff --git a/ImporterShared/Winline/Entities/Account.vb b/MultiTool.Shared/Winline/Entities/Account.vb
similarity index 100%
rename from ImporterShared/Winline/Entities/Account.vb
rename to MultiTool.Shared/Winline/Entities/Account.vb
diff --git a/ImporterShared/Winline/Entities/Contact.vb b/MultiTool.Shared/Winline/Entities/Contact.vb
similarity index 100%
rename from ImporterShared/Winline/Entities/Contact.vb
rename to MultiTool.Shared/Winline/Entities/Contact.vb
diff --git a/ImporterShared/Winline/Entities/DocumentKind.vb b/MultiTool.Shared/Winline/Entities/DocumentKind.vb
similarity index 100%
rename from ImporterShared/Winline/Entities/DocumentKind.vb
rename to MultiTool.Shared/Winline/Entities/DocumentKind.vb
diff --git a/ImporterShared/Winline/Entities/Mandator.vb b/MultiTool.Shared/Winline/Entities/Mandator.vb
similarity index 100%
rename from ImporterShared/Winline/Entities/Mandator.vb
rename to MultiTool.Shared/Winline/Entities/Mandator.vb
diff --git a/ImporterShared/Winline/Entities/TemplateColumn.vb b/MultiTool.Shared/Winline/Entities/TemplateColumn.vb
similarity index 100%
rename from ImporterShared/Winline/Entities/TemplateColumn.vb
rename to MultiTool.Shared/Winline/Entities/TemplateColumn.vb
diff --git a/ImporterShared/Winline/WebService.vb b/MultiTool.Shared/Winline/WebService.vb
similarity index 99%
rename from ImporterShared/Winline/WebService.vb
rename to MultiTool.Shared/Winline/WebService.vb
index a28e448..a1e9521 100644
--- a/ImporterShared/Winline/WebService.vb
+++ b/MultiTool.Shared/Winline/WebService.vb
@@ -5,7 +5,7 @@ Imports System.Globalization
 Imports AutoMapper
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Filesystem
-Imports ImporterShared.Documents
+Imports MultiTool.Shared.Documents
 Imports System.Text
 
 Namespace Winline
diff --git a/ImporterShared/XmlData.vb b/MultiTool.Shared/XmlData.vb
similarity index 100%
rename from ImporterShared/XmlData.vb
rename to MultiTool.Shared/XmlData.vb
diff --git a/ImporterShared/packages.config b/MultiTool.Shared/packages.config
similarity index 100%
rename from ImporterShared/packages.config
rename to MultiTool.Shared/packages.config
diff --git a/EDIDocumentImporter.sln b/MultiTool.sln
similarity index 80%
rename from EDIDocumentImporter.sln
rename to MultiTool.sln
index 458fc4f..a330c8a 100644
--- a/EDIDocumentImporter.sln
+++ b/MultiTool.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31005.135
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImporterForm", "EDIDocumentImport\ImporterForm.vbproj", "{7AAEC958-955D-4F77-964C-38658684E424}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Form", "MultiTool.Form\MultiTool.Form.vbproj", "{7AAEC958-955D-4F77-964C-38658684E424}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImporterShared", "ImporterShared\ImporterShared.vbproj", "{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Shared", "MultiTool.Shared\MultiTool.Shared.vbproj", "{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution