diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index a1cd7e47..36b41591 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -36,7 +36,7 @@
                         <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
                     </td>
                     <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Modules" UploadMultiple="true" />
+                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
                     </td>
                 </tr>
             </table>
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index b0233be0..175ed65d 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -36,7 +36,7 @@
                         <Label HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
                     </td>
                     <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Themes" UploadMultiple="@true" />
+                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="@true" />
                     </td>
                 </tr>
             </table>
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
index 218ae73e..29b1c80e 100644
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
@@ -27,6 +27,6 @@
   </ItemGroup>
 
   <Target Name="CopyPackage" AfterTargets="Pack">
-    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(PackageName).bak" />
+    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\Packages\$(PackageName).bak" />
   </Target>
 </Project>
diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
index 881153c5..7b29da52 100644
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
+++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
@@ -29,6 +29,6 @@
   </ItemGroup>
 
   <Target Name="CopyPackage" AfterTargets="Pack">
-    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(PackageName).bak" />
+    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\Packages\$(PackageName).bak" />
   </Target>
 </Project>
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
index 2765330b..7db77845 100644
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <Target Name="CopyPackage" AfterTargets="Pack">
-    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(PackageName).bak" />
+    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\Packages\$(PackageName).bak" />
   </Target>
 
 </Project>
diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
index 1f30300b..2ecb1178 100644
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
+++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <Target Name="CopyPackage" AfterTargets="Pack">
-    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(PackageName).bak" />
+    <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\Packages\$(PackageName).bak" />
   </Target>
 
 </Project>
diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs
index 84dc4281..bcc86e9d 100644
--- a/Oqtane.Server/Controllers/FileController.cs
+++ b/Oqtane.Server/Controllers/FileController.cs
@@ -499,7 +499,7 @@ namespace Oqtane.Controllers
 
         private string GetFolderPath(string folder)
         {
-            return Utilities.PathCombine(_environment.WebRootPath, folder);
+            return Utilities.PathCombine(_environment.ContentRootPath, folder);
         }
 
         private void CreateDirectory(string folderpath)
diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs
index c5c94dc7..78c12da1 100644
--- a/Oqtane.Server/Controllers/PackageController.cs
+++ b/Oqtane.Server/Controllers/PackageController.cs
@@ -65,7 +65,7 @@ namespace Oqtane.Controllers
         {
             using (var httpClient = new HttpClient())
             {
-                folder = Path.Combine(_environment.WebRootPath, folder);
+                folder = Path.Combine(_environment.ContentRootPath, folder);
                 var response = await httpClient.GetAsync("https://www.nuget.org/api/v2/package/" + packageid.ToLower() + "/" + version).ConfigureAwait(false);
                 response.EnsureSuccessStatusCode();
                 string filename = packageid + "." + version + ".nupkg";
diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs
index 2f43f308..cbc6f661 100644
--- a/Oqtane.Server/Infrastructure/InstallationManager.cs
+++ b/Oqtane.Server/Infrastructure/InstallationManager.cs
@@ -38,7 +38,7 @@ namespace Oqtane.Infrastructure
             bool install = false;
             string binPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
 
-            string sourceFolder = Path.Combine(webRootPath, "Packages");
+            string sourceFolder = Path.Combine(contentRootPath, "Packages");
             if (!Directory.Exists(sourceFolder))
             {
                 Directory.CreateDirectory(sourceFolder);
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak b/Oqtane.Server/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak
similarity index 100%
rename from Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak
rename to Oqtane.Server/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak b/Oqtane.Server/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak
similarity index 100%
rename from Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak
rename to Oqtane.Server/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak b/Oqtane.Server/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak
similarity index 100%
rename from Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak
rename to Oqtane.Server/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak b/Oqtane.Server/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak
similarity index 100%
rename from Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak
rename to Oqtane.Server/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak
diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj
index 2e49636e..c9eb72b7 100644
--- a/Oqtane.Test/Oqtane.Test.csproj
+++ b/Oqtane.Test/Oqtane.Test.csproj
@@ -29,29 +29,41 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Oqtane.Database.MySQL\Oqtane.Database.MySQL.csproj" />
-    <ProjectReference Include="..\Oqtane.Database.PostgreSQL\Oqtane.Database.PostgreSQL.csproj" />
-    <ProjectReference Include="..\Oqtane.Database.Sqlite\Oqtane.Database.Sqlite.csproj" />
-    <ProjectReference Include="..\Oqtane.Database.SqlServer\Oqtane.Database.SqlServer.csproj" />
     <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Remove="Oqtane.Database.MySQL\**" />
+    <Compile Remove="Oqtane.Database.PostgreSQL\**" />
+    <Compile Remove="Oqtane.Database.Sqlite\**" />
+    <Compile Remove="Oqtane.Database.SqlServer\**" />
     <Compile Remove="Repository\**" />
     <Compile Remove="Security\**" />
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Remove="Oqtane.Database.MySQL\**" />
+    <EmbeddedResource Remove="Oqtane.Database.PostgreSQL\**" />
+    <EmbeddedResource Remove="Oqtane.Database.Sqlite\**" />
+    <EmbeddedResource Remove="Oqtane.Database.SqlServer\**" />
     <EmbeddedResource Remove="Repository\**" />
     <EmbeddedResource Remove="Security\**" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="Oqtane.Database.MySQL\**" />
+    <None Remove="Oqtane.Database.PostgreSQL\**" />
+    <None Remove="Oqtane.Database.Sqlite\**" />
+    <None Remove="Oqtane.Database.SqlServer\**" />
     <None Remove="Repository\**" />
     <None Remove="Security\**" />
   </ItemGroup>
 
   <ItemGroup>
+    <Content Remove="Oqtane.Database.MySQL\**" />
+    <Content Remove="Oqtane.Database.PostgreSQL\**" />
+    <Content Remove="Oqtane.Database.Sqlite\**" />
+    <Content Remove="Oqtane.Database.SqlServer\**" />
     <Content Remove="Repository\**" />
     <Content Remove="Security\**" />
   </ItemGroup>