diff --git a/EnvelopeGenerator.Common/Entities/EmailData.vb b/EnvelopeGenerator.Common/Entities/EmailData.vb
index cb11e82f..bf54bd57 100644
--- a/EnvelopeGenerator.Common/Entities/EmailData.vb
+++ b/EnvelopeGenerator.Common/Entities/EmailData.vb
@@ -28,7 +28,7 @@ Public Class EmailData
     ''' <param name="pEnvelope"></param>
     ''' <param name="pReceiver"></param>
     ''' <param name="pStatus"></param>
-    Public Sub New(pEnvelope As Envelope, pReceiver As Receiver, pStatus As Constants.EnvelopeStatus)
+    Public Sub New(pEnvelope As Entities.Envelope, pReceiver As Receiver, pStatus As Constants.EnvelopeStatus)
         EmailAdress = pReceiver.EmailAddress
         EmailSubject = String.Empty
         EmailType = pStatus
@@ -64,7 +64,7 @@ Public Class EmailData
     ''' </summary>
     ''' <param name="pEnvelope"></param>
     ''' <param name="pStatus"></param>
-    Public Sub New(pEnvelope As Envelope, pStatus As Constants.EnvelopeStatus)
+    Public Sub New(pEnvelope As Entities.Envelope, pStatus As Constants.EnvelopeStatus)
         EmailAdress = pEnvelope.User.Email
         EmailSubject = String.Empty
         EmailType = pStatus
diff --git a/EnvelopeGenerator.Form/Controllers/BaseController.vb b/EnvelopeGenerator.Form/Controllers/BaseController.vb
index 9f9a7e9e..99d18052 100644
--- a/EnvelopeGenerator.Form/Controllers/BaseController.vb
+++ b/EnvelopeGenerator.Form/Controllers/BaseController.vb
@@ -2,9 +2,7 @@
 Imports DigitalData.Modules.Base
 Imports EnvelopeGenerator.Common
 Imports System.Data.SqlClient
-Imports DevExpress.DocumentView
-Imports System.Transactions
-Imports System.IO
+Imports EnvelopeGenerator.Domain.Entities
 
 Public MustInherit Class BaseController
     Inherits BaseClass
diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
index 481706e6..f246c083 100644
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -5,6 +5,7 @@ Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
 Imports EnvelopeGenerator.Common.My
 Imports EnvelopeGenerator.Domain.Constants
+Imports EnvelopeGenerator.Domain.Entities
 
 Public Class EnvelopeEditorController
     Inherits BaseController
diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb
index 89f79e38..a25fd5ec 100644
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb
@@ -1,5 +1,6 @@
 Imports DevExpress.XtraCharts
 Imports EnvelopeGenerator.Common
+Imports EnvelopeGenerator.Domain
 
 Public Class EnvelopeListController
     Inherits BaseController
@@ -8,14 +9,14 @@ Public Class EnvelopeListController
         MyBase.New(pState)
     End Sub
 
-    Public Function ListEnvelopes() As IEnumerable(Of Envelope)
+    Public Function ListEnvelopes() As IEnumerable(Of Entities.Envelope)
         Return EnvelopeModel.List()
     End Function
     Public Function ListCompleted() As Object
         Return EnvelopeModel.ListCompleted()
     End Function
 
-    Public Overloads Function DeleteEnvelope(pEnvelope As Envelope, pReason As String) As Boolean
+    Public Overloads Function DeleteEnvelope(pEnvelope As Entities.Envelope, pReason As String) As Boolean
         Return MyBase.DeleteEnvelope(pEnvelope, pReason)
     End Function
 
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index cdaa2a86..dba158be 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -13,6 +13,7 @@ Imports EnvelopeGenerator.Domain
 Imports EnvelopeGenerator.Common.My
 Imports GdPicture14
 Imports EnvelopeGenerator.Domain.Constants
+Imports EnvelopeGenerator.Domain.Entities
 
 Partial Public Class frmEnvelopeEditor
     Public Property Envelope As Envelope
diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
index af9c75ab..1233eac7 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
@@ -1,12 +1,14 @@
 Imports EnvelopeGenerator.Common
 Imports EnvelopeGenerator.Common.My
-Imports EnvelopeGenerator.Common.Constants
+Imports EnvelopeGenerator.Domain
 Imports System.ComponentModel
 Imports EnvelopeGenerator.Domain.Constants
+Imports EnvelopeGenerator.Domain.Entities
+
 
 Public Class frmEnvelopeMainData
     Private FormLoaded As Boolean = False
-    Public Property Envelope As Envelope = New Envelope()
+    Public Property Envelope As Entities.Envelope = New Entities.Envelope()
     Public Property NewEnvelopeMode As Boolean = True
 
     Private Property EnvelopeTypeModel As EnvelopeTypeModel
diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb
index 380e3ac6..7b1128e9 100644
--- a/EnvelopeGenerator.Form/frmFieldEditor.vb
+++ b/EnvelopeGenerator.Form/frmFieldEditor.vb
@@ -1,12 +1,11 @@
-Imports System.Collections
-Imports DevExpress.Utils
+Imports DevExpress.Utils
 Imports DevExpress.Utils.Svg
 Imports DevExpress.XtraBars
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
-Imports EnvelopeGenerator.Common.Constants
 Imports EnvelopeGenerator.Common.My
 Imports EnvelopeGenerator.Domain.Constants
+Imports EnvelopeGenerator.Domain.Entities
 Imports GdPicture14
 Imports GdPicture14.Annotations