diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 4ba5c66c..446622cf 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -20,6 +20,7 @@
     <Content Remove="wwwroot\_content\*\**" />
     <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
     <EmbeddedResource Remove="wwwroot\Themes\Templates\**" />
+    <None Remove="wwwroot\Modules\Templates\**" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Scripts\MigrateMaster.sql" />
@@ -78,4 +79,8 @@
     <!-- extends watching group to include *.dll files and exclude the ones cause an infinite loop -->
     <Watch Include="**\*.dll" Exclude="**\Microsoft.EntityFrameworkCore.*.dll;**\Oqtane.Database.*.dll;" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <Watch Remove="wwwroot\Modules\Templates\**" />
+  </ItemGroup>
 </Project>
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs
index d433d698..24046476 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Services/[Module]Service.cs
@@ -7,18 +7,6 @@ using Oqtane.Shared;
 
 namespace [Owner].Module.[Module].Services
 {
-    public interface I[Module]Service 
-    {
-        Task<List<Models.[Module]>> Get[Module]sAsync(int ModuleId);
-
-        Task<Models.[Module]> Get[Module]Async(int [Module]Id, int ModuleId);
-
-        Task<Models.[Module]> Add[Module]Async(Models.[Module] [Module]);
-
-        Task<Models.[Module]> Update[Module]Async(Models.[Module] [Module]);
-
-        Task Delete[Module]Async(int [Module]Id, int ModuleId);
-    }
 
     public class [Module]Service : ServiceBase, I[Module]Service
     {
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/Interfaces/I[Module]Service.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/Interfaces/I[Module]Service.cs
new file mode 100644
index 00000000..8c75bf44
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/Interfaces/I[Module]Service.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace [Owner].Module.[Module].Services
+{
+    public interface I[Module]Service 
+    {
+        Task<List<Models.[Module]>> Get[Module]sAsync(int ModuleId);
+
+        Task<Models.[Module]> Get[Module]Async(int [Module]Id, int ModuleId);
+
+        Task<Models.[Module]> Add[Module]Async(Models.[Module] [Module]);
+
+        Task<Models.[Module]> Update[Module]Async(Models.[Module] [Module]);
+
+        Task Delete[Module]Async(int [Module]Id, int ModuleId);
+    }
+}