diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb
deleted file mode 100644
index 6ec029aa..00000000
--- a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb
+++ /dev/null
@@ -1,6 +0,0 @@
-Imports EnvelopeGenerator.Domain.Entities
-
-Public Class EnvelopeReceiver
-    Public Property Envelope As Envelope
-    Public Property Receiver As Receiver
-End Class
diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
index 9ac39da3..d663e47b 100644
--- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
+++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
@@ -274,14 +274,13 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Config.vb" />
-    <Compile Include="Entities\DbConfig.vb" />
-    <Compile Include="Entities\ElementStatus.vb" />
-    <Compile Include="Entities\EmailData.vb" />
+    <Compile Include="Models\DbConfig.vb" />
+    <Compile Include="Models\ElementStatus.vb" />
+    <Compile Include="Models\EmailData.vb" />
     <Compile Include="Jobs\APIBackendJobs\APIEnvelopeJob.vb" />
     <Compile Include="Jobs\FinalizeDocument\PDFBurnerParams.vb" />
     <Compile Include="Services\TemplateService.vb" />
-    <Compile Include="Entities\EnvelopeReceiver.vb" />
-    <Compile Include="Entities\State.vb" />
+    <Compile Include="Models\State.vb" />
     <Compile Include="Helpers.vb" />
     <Compile Include="Jobs\FinalizeDocument\FinalizeDocumentExceptions.vb" />
     <Compile Include="Jobs\FinalizeDocument\FinalizeDocumentJob.vb" />
diff --git a/EnvelopeGenerator.Common/Entities/DbConfig.vb b/EnvelopeGenerator.Common/Models/DbConfig.vb
similarity index 100%
rename from EnvelopeGenerator.Common/Entities/DbConfig.vb
rename to EnvelopeGenerator.Common/Models/DbConfig.vb
diff --git a/EnvelopeGenerator.Common/Entities/ElementStatus.vb b/EnvelopeGenerator.Common/Models/ElementStatus.vb
similarity index 100%
rename from EnvelopeGenerator.Common/Entities/ElementStatus.vb
rename to EnvelopeGenerator.Common/Models/ElementStatus.vb
diff --git a/EnvelopeGenerator.Common/Entities/EmailData.vb b/EnvelopeGenerator.Common/Models/EmailData.vb
similarity index 100%
rename from EnvelopeGenerator.Common/Entities/EmailData.vb
rename to EnvelopeGenerator.Common/Models/EmailData.vb
diff --git a/EnvelopeGenerator.Common/Entities/State.vb b/EnvelopeGenerator.Common/Models/State.vb
similarity index 100%
rename from EnvelopeGenerator.Common/Entities/State.vb
rename to EnvelopeGenerator.Common/Models/State.vb