diff --git a/bitwarden-core.sln b/bitwarden-core.sln
index 6630550bf1..f5fd49c697 100644
--- a/bitwarden-core.sln
+++ b/bitwarden-core.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.4
+VisualStudioVersion = 15.0.26430.6
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}"
 EndProject
@@ -22,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "src\Api\Api.csproj",
 EndProject
 Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "Sql", "src\Sql\Sql.sqlproj", "{58554E52-FDEC-4832-AFF9-302B01E08DCA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mail", "src\Mail\Mail.csproj", "{B78A6C74-1A24-48C6-802A-13BE3E4DAFF1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mail", "util\Mail\Mail.csproj", "{B78A6C74-1A24-48C6-802A-13BE3E4DAFF1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Billing", "src\Billing\Billing.csproj", "{02BC2982-ED8D-4A6D-A41E-092B3DAEB98A}"
 EndProject
@@ -74,7 +74,7 @@ Global
 		{3973D21B-A692-4B60-9B70-3631C057423A} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
 		{E8548AD6-7FB0-439A-8EB5-549A10336D2D} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
 		{58554E52-FDEC-4832-AFF9-302B01E08DCA} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
-		{B78A6C74-1A24-48C6-802A-13BE3E4DAFF1} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
+		{B78A6C74-1A24-48C6-802A-13BE3E4DAFF1} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
 		{02BC2982-ED8D-4A6D-A41E-092B3DAEB98A} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
 		{04148736-3C0B-445E-8B74-2020E7A53502} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
 		{05C45D68-DAB9-40E6-9E2E-F81BBD2E0C42} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
diff --git a/src/Mail/Mail.csproj b/util/Mail/Mail.csproj
similarity index 100%
rename from src/Mail/Mail.csproj
rename to util/Mail/Mail.csproj
diff --git a/src/Mail/Program.cs b/util/Mail/Program.cs
similarity index 100%
rename from src/Mail/Program.cs
rename to util/Mail/Program.cs
diff --git a/src/Mail/Properties/launchSettings.json b/util/Mail/Properties/launchSettings.json
similarity index 100%
rename from src/Mail/Properties/launchSettings.json
rename to util/Mail/Properties/launchSettings.json
diff --git a/src/Mail/Startup.cs b/util/Mail/Startup.cs
similarity index 100%
rename from src/Mail/Startup.cs
rename to util/Mail/Startup.cs
diff --git a/src/Mail/gulpfile.js b/util/Mail/gulpfile.js
similarity index 100%
rename from src/Mail/gulpfile.js
rename to util/Mail/gulpfile.js
diff --git a/src/Mail/package.json b/util/Mail/package.json
similarity index 100%
rename from src/Mail/package.json
rename to util/Mail/package.json
diff --git a/src/Mail/web.config b/util/Mail/web.config
similarity index 100%
rename from src/Mail/web.config
rename to util/Mail/web.config
diff --git a/src/Mail/wwwroot/index.html b/util/Mail/wwwroot/index.html
similarity index 100%
rename from src/Mail/wwwroot/index.html
rename to util/Mail/wwwroot/index.html
diff --git a/src/Mail/wwwroot/styles.css b/util/Mail/wwwroot/styles.css
similarity index 100%
rename from src/Mail/wwwroot/styles.css
rename to util/Mail/wwwroot/styles.css
diff --git a/src/Mail/wwwroot/templates/announcement.html b/util/Mail/wwwroot/templates/announcement.html
similarity index 100%
rename from src/Mail/wwwroot/templates/announcement.html
rename to util/Mail/wwwroot/templates/announcement.html
diff --git a/src/Mail/wwwroot/templates/welcome.html b/util/Mail/wwwroot/templates/welcome.html
similarity index 100%
rename from src/Mail/wwwroot/templates/welcome.html
rename to util/Mail/wwwroot/templates/welcome.html
diff --git a/src/SqlUpdate/2017-05-08_00_OrgUseGroups.sql b/util/SqlUpdate/2017-05-08_00_OrgUseGroups.sql
similarity index 100%
rename from src/SqlUpdate/2017-05-08_00_OrgUseGroups.sql
rename to util/SqlUpdate/2017-05-08_00_OrgUseGroups.sql
diff --git a/src/SqlUpdate/2017-05-11_00_AlterCollectionUser.sql b/util/SqlUpdate/2017-05-11_00_AlterCollectionUser.sql
similarity index 100%
rename from src/SqlUpdate/2017-05-11_00_AlterCollectionUser.sql
rename to util/SqlUpdate/2017-05-11_00_AlterCollectionUser.sql