diff --git a/bitwarden-server.sln b/bitwarden-server.sln
index 832b6240a..6eda803c3 100644
--- a/bitwarden-server.sln
+++ b/bitwarden-server.sln
@@ -47,7 +47,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Test", "test\Core.Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventsProcessor", "src\EventsProcessor\EventsProcessor.csproj", "{79BB453F-D0D8-4DDF-9809-A405C56692BD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migrator", "src\Migrator\Migrator.csproj", "{54DED792-A022-417E-9804-21FCC9C7C610}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migrator", "util\Migrator\Migrator.csproj", "{54DED792-A022-417E-9804-21FCC9C7C610}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj
index 886f133bb..363b964cd 100644
--- a/src/Admin/Admin.csproj
+++ b/src/Admin/Admin.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
   
   <ItemGroup>
+    <ProjectReference Include="..\..\util\Migrator\Migrator.csproj" />
     <ProjectReference Include="..\Core\Core.csproj" />
-    <ProjectReference Include="..\Migrator\Migrator.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Migrator/DbMigrator.cs b/util/Migrator/DbMigrator.cs
similarity index 100%
rename from src/Migrator/DbMigrator.cs
rename to util/Migrator/DbMigrator.cs
diff --git a/src/Migrator/DbScripts/2017-08-19_00_InitialSetup.sql b/util/Migrator/DbScripts/2017-08-19_00_InitialSetup.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-08-19_00_InitialSetup.sql
rename to util/Migrator/DbScripts/2017-08-19_00_InitialSetup.sql
diff --git a/src/Migrator/DbScripts/2017-08-22_00_LicenseCheckScripts.sql b/util/Migrator/DbScripts/2017-08-22_00_LicenseCheckScripts.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-08-22_00_LicenseCheckScripts.sql
rename to util/Migrator/DbScripts/2017-08-22_00_LicenseCheckScripts.sql
diff --git a/src/Migrator/DbScripts/2017-08-30_00_CollectionWriteOnly.sql b/util/Migrator/DbScripts/2017-08-30_00_CollectionWriteOnly.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-08-30_00_CollectionWriteOnly.sql
rename to util/Migrator/DbScripts/2017-08-30_00_CollectionWriteOnly.sql
diff --git a/src/Migrator/DbScripts/2017-09-06_00_CipherDetails.sql b/util/Migrator/DbScripts/2017-09-06_00_CipherDetails.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-09-06_00_CipherDetails.sql
rename to util/Migrator/DbScripts/2017-09-06_00_CipherDetails.sql
diff --git a/src/Migrator/DbScripts/2017-09-08_00_OrgUserCounts.sql b/util/Migrator/DbScripts/2017-09-08_00_OrgUserCounts.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-09-08_00_OrgUserCounts.sql
rename to util/Migrator/DbScripts/2017-09-08_00_OrgUserCounts.sql
diff --git a/src/Migrator/DbScripts/2017-10-25_00_OrgUserUpdates.sql b/util/Migrator/DbScripts/2017-10-25_00_OrgUserUpdates.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-10-25_00_OrgUserUpdates.sql
rename to util/Migrator/DbScripts/2017-10-25_00_OrgUserUpdates.sql
diff --git a/src/Migrator/DbScripts/2017-11-06_00_FamilyPlanAdjustments.sql b/util/Migrator/DbScripts/2017-11-06_00_FamilyPlanAdjustments.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-11-06_00_FamilyPlanAdjustments.sql
rename to util/Migrator/DbScripts/2017-11-06_00_FamilyPlanAdjustments.sql
diff --git a/src/Migrator/DbScripts/2017-11-13_00_IndexTuning.sql b/util/Migrator/DbScripts/2017-11-13_00_IndexTuning.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-11-13_00_IndexTuning.sql
rename to util/Migrator/DbScripts/2017-11-13_00_IndexTuning.sql
diff --git a/src/Migrator/DbScripts/2017-11-24_00_UpdateProcs.sql b/util/Migrator/DbScripts/2017-11-24_00_UpdateProcs.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-11-24_00_UpdateProcs.sql
rename to util/Migrator/DbScripts/2017-11-24_00_UpdateProcs.sql
diff --git a/src/Migrator/DbScripts/2017-12-12_00_Events.sql b/util/Migrator/DbScripts/2017-12-12_00_Events.sql
similarity index 100%
rename from src/Migrator/DbScripts/2017-12-12_00_Events.sql
rename to util/Migrator/DbScripts/2017-12-12_00_Events.sql
diff --git a/src/Migrator/DbScripts/2018-02-28_00_LoginUris.sql b/util/Migrator/DbScripts/2018-02-28_00_LoginUris.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-02-28_00_LoginUris.sql
rename to util/Migrator/DbScripts/2018-02-28_00_LoginUris.sql
diff --git a/src/Migrator/DbScripts/2018-03-12_00_FixLoginUris.sql b/util/Migrator/DbScripts/2018-03-12_00_FixLoginUris.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-03-12_00_FixLoginUris.sql
rename to util/Migrator/DbScripts/2018-03-12_00_FixLoginUris.sql
diff --git a/src/Migrator/DbScripts/2018-03-21_00_AdminPortal.sql b/util/Migrator/DbScripts/2018-03-21_00_AdminPortal.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-03-21_00_AdminPortal.sql
rename to util/Migrator/DbScripts/2018-03-21_00_AdminPortal.sql
diff --git a/src/Migrator/DbScripts/2018-04-02_00_Org2fa.sql b/util/Migrator/DbScripts/2018-04-02_00_Org2fa.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-04-02_00_Org2fa.sql
rename to util/Migrator/DbScripts/2018-04-02_00_Org2fa.sql
diff --git a/src/Migrator/DbScripts/2018-04-24_00_CipherQueryTuning.sql b/util/Migrator/DbScripts/2018-04-24_00_CipherQueryTuning.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-04-24_00_CipherQueryTuning.sql
rename to util/Migrator/DbScripts/2018-04-24_00_CipherQueryTuning.sql
diff --git a/src/Migrator/DbScripts/2018-06-11_00_WebVaultUpdates.sql b/util/Migrator/DbScripts/2018-06-11_00_WebVaultUpdates.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-06-11_00_WebVaultUpdates.sql
rename to util/Migrator/DbScripts/2018-06-11_00_WebVaultUpdates.sql
diff --git a/src/Migrator/DbScripts/2018-07-28_00_DbTuning.sql b/util/Migrator/DbScripts/2018-07-28_00_DbTuning.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-07-28_00_DbTuning.sql
rename to util/Migrator/DbScripts/2018-07-28_00_DbTuning.sql
diff --git a/src/Migrator/DbScripts/2018-08-14_00_UserKdf.sql b/util/Migrator/DbScripts/2018-08-14_00_UserKdf.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-08-14_00_UserKdf.sql
rename to util/Migrator/DbScripts/2018-08-14_00_UserKdf.sql
diff --git a/src/Migrator/DbScripts/2018-08-28_00_PremiumOrgAbilities.sql b/util/Migrator/DbScripts/2018-08-28_00_PremiumOrgAbilities.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-08-28_00_PremiumOrgAbilities.sql
rename to util/Migrator/DbScripts/2018-08-28_00_PremiumOrgAbilities.sql
diff --git a/src/Migrator/DbScripts/2018-09-25_00_OrgPurge.sql b/util/Migrator/DbScripts/2018-09-25_00_OrgPurge.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-09-25_00_OrgPurge.sql
rename to util/Migrator/DbScripts/2018-09-25_00_OrgPurge.sql
diff --git a/src/Migrator/DbScripts/2018-10-17_00_ManagerRole.sql b/util/Migrator/DbScripts/2018-10-17_00_ManagerRole.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-10-17_00_ManagerRole.sql
rename to util/Migrator/DbScripts/2018-10-17_00_ManagerRole.sql
diff --git a/src/Migrator/DbScripts/2018-12-19_00_OrgUserTwoFactorEnabled.sql b/util/Migrator/DbScripts/2018-12-19_00_OrgUserTwoFactorEnabled.sql
similarity index 100%
rename from src/Migrator/DbScripts/2018-12-19_00_OrgUserTwoFactorEnabled.sql
rename to util/Migrator/DbScripts/2018-12-19_00_OrgUserTwoFactorEnabled.sql
diff --git a/src/Migrator/DbScripts/2019-01-31_00_Transactions.sql b/util/Migrator/DbScripts/2019-01-31_00_Transactions.sql
similarity index 100%
rename from src/Migrator/DbScripts/2019-01-31_00_Transactions.sql
rename to util/Migrator/DbScripts/2019-01-31_00_Transactions.sql
diff --git a/src/Migrator/DbScripts/2019-03-01_00_OrgApi.sql b/util/Migrator/DbScripts/2019-03-01_00_OrgApi.sql
similarity index 100%
rename from src/Migrator/DbScripts/2019-03-01_00_OrgApi.sql
rename to util/Migrator/DbScripts/2019-03-01_00_OrgApi.sql
diff --git a/src/Migrator/DbUpLogger.cs b/util/Migrator/DbUpLogger.cs
similarity index 100%
rename from src/Migrator/DbUpLogger.cs
rename to util/Migrator/DbUpLogger.cs
diff --git a/src/Migrator/Migrator.csproj b/util/Migrator/Migrator.csproj
similarity index 100%
rename from src/Migrator/Migrator.csproj
rename to util/Migrator/Migrator.csproj
diff --git a/util/Setup/Setup.csproj b/util/Setup/Setup.csproj
index 999f4110d..dc7de38f9 100644
--- a/util/Setup/Setup.csproj
+++ b/util/Setup/Setup.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Migrator\Migrator.csproj" />
+    <ProjectReference Include="..\Migrator\Migrator.csproj" />
   </ItemGroup>
 
 </Project>