diff --git a/GitVersion.yml b/GitVersion.yml
index 3cca9f29..b0fa2437 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,5 +1,5 @@
 mode: ContinuousDeployment
-next-version: 0.15.0
+next-version: 0.16.0
 branches:
   main:
     regex: ^master$|^main$
diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs
index b8d656b7..dccd948e 100644
--- a/cake/BuildContext.cs
+++ b/cake/BuildContext.cs
@@ -41,6 +41,8 @@ public class BuildContext : FrostingContext
 
     public string ScrDir => Path.GetFullPath(Path.Combine(Environment.WorkingDirectory.FullPath, "..//src//"));
 
+    public string TemplatesDir => Path.GetFullPath(Path.Combine(Environment.WorkingDirectory.FullPath, "..//templates//"));
+
     public Cake.Common.Tools.DotNet.Build.DotNetBuildSettings DotNetBuildSettings { get; }
 
     public DotNetRestoreSettings DotNetRestoreTemplatesSettings { get; }
@@ -173,13 +175,13 @@ public void PushNugetPackages(string artifactDirectory)
     {
         var templates = new List<(string ax, string approject, string solution)>()
         {
-            (Path.Combine(this.ScrDir, "AXSharp.templates\\working\\templates\\axsharpblazor\\ax\\"),
-                Path.Combine(this.ScrDir,"AXSharp.templates\\working\\templates\\axsharpblazor\\axsharpblazor.app\\axsharpblazor.hmi.csproj"),
-                    Path.Combine(this.ScrDir,"AXSharp.templates\\working\\templates\\axsharpblazor\\axsharpblazor.sln")),
+            (Path.Combine(this.TemplatesDir, "working\\templates\\axsharpblazor\\ax\\"),
+                Path.Combine(this.TemplatesDir,"working\\templates\\axsharpblazor\\axsharpblazor.app\\axsharpblazor.hmi.csproj"),
+                    Path.Combine(this.TemplatesDir,"working\\templates\\axsharpblazor\\axsharpblazor.sln")),
 
-            (Path.Combine(this.ScrDir, "AXSharp.templates\\working\\templates\\axsharpconsole\\ax"),
-                Path.Combine(this.ScrDir,"AXSharp.templates\\working\\templates\\axsharpconsole\\axsharpconsole\\axsharpconsole.app.csproj"),
-                    Path.Combine(this.ScrDir,"AXSharp.templates\\working\\templates\\axsharpconsole\\axsharpconsole.sln"))
+            (Path.Combine(this.TemplatesDir, "working\\templates\\axsharpconsole\\ax"),
+                Path.Combine(this.TemplatesDir,"working\\templates\\axsharpconsole\\axsharpconsole\\axsharpconsole.app.csproj"),
+                    Path.Combine(this.TemplatesDir,"working\\templates\\axsharpconsole\\axsharpconsole.sln"))
            
         };
 
diff --git a/cake/Program.cs b/cake/Program.cs
index 390620c9..a248cce8 100644
--- a/cake/Program.cs
+++ b/cake/Program.cs
@@ -317,7 +317,7 @@ public override void Run(BuildContext context)
             return;
         }
 
-        var templatesDirectory = Path.Combine(context.ScrDir, "AXSharp.templates\\working\\templates");
+        var templatesDirectory = Path.Combine(context.TemplatesDir);
         var templateCsProjFiles = Directory.EnumerateFiles(templatesDirectory, "*.csproj", SearchOption.AllDirectories);
 
         foreach (var templateCsProjFile in templateCsProjFiles)
@@ -369,8 +369,8 @@ public override void Run(BuildContext context)
 
         foreach (var template in context.GetTemplateProjects())
         {
-            context.DotNetRestore(Path.Combine(context.ScrDir, template.solution), context.DotNetRestoreTemplatesSettings);
-            context.DotNetBuild(Path.Combine(context.ScrDir, template.solution), context.DotNetBuildSettings);
+            context.DotNetRestore(Path.Combine(context.TemplatesDir, template.solution), context.DotNetRestoreTemplatesSettings);
+            context.DotNetBuild(Path.Combine(context.TemplatesDir, template.solution), context.DotNetBuildSettings);
         }
     }
 }
@@ -415,7 +415,7 @@ public override void Run(BuildContext context)
         }
 
         PackTemplatePackages(context,
-            Path.Combine(context.ScrDir, "AXSharp.templates\\working\\AXSharp.templates.sln"));
+            Path.Combine(context.TemplatesDir, "AXSharp.templates.sln"));
         context.PushNugetPackages("templates");
 
         context.CheckLicenseComplianceInArtifacts();
diff --git a/publish-no-tests.ps1 b/publish-no-tests.ps1
index 6e517acd..0e88ffb7 100644
--- a/publish-no-tests.ps1
+++ b/publish-no-tests.ps1
@@ -1,4 +1,4 @@
 # run build
 
-dotnet run --project cake/Build.csproj --do-pack --do-publish --test-level 1
+dotnet run --project cake/Build.csproj --do-pack --do-publish --test-level 2
 exit $LASTEXITCODE;
\ No newline at end of file
diff --git a/src/AXSharp.templates/working/AXSharp.templates.csproj b/templates/working/AXSharp.templates.csproj
similarity index 100%
rename from src/AXSharp.templates/working/AXSharp.templates.csproj
rename to templates/working/AXSharp.templates.csproj
diff --git a/src/AXSharp.templates/working/AXSharp.templates.sln b/templates/working/AXSharp.templates.sln
similarity index 100%
rename from src/AXSharp.templates/working/AXSharp.templates.sln
rename to templates/working/AXSharp.templates.sln
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/.config/dotnet-tools.json b/templates/working/templates/axsharpblazor/.config/dotnet-tools.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/.config/dotnet-tools.json
rename to templates/working/templates/axsharpblazor/.config/dotnet-tools.json
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/.template.config/template.json b/templates/working/templates/axsharpblazor/.template.config/template.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/.template.config/template.json
rename to templates/working/templates/axsharpblazor/.template.config/template.json
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/README.md b/templates/working/templates/axsharpblazor/README.md
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/README.md
rename to templates/working/templates/axsharpblazor/README.md
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/.gitignore b/templates/working/templates/axsharpblazor/ax/.gitignore
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/.gitignore
rename to templates/working/templates/axsharpblazor/ax/.gitignore
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/AXSharp.config.json b/templates/working/templates/axsharpblazor/ax/AXSharp.config.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/AXSharp.config.json
rename to templates/working/templates/axsharpblazor/ax/AXSharp.config.json
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/apax-lock.json b/templates/working/templates/axsharpblazor/ax/apax-lock.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/apax-lock.json
rename to templates/working/templates/axsharpblazor/ax/apax-lock.json
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/apax.yml b/templates/working/templates/axsharpblazor/ax/apax.yml
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/apax.yml
rename to templates/working/templates/axsharpblazor/ax/apax.yml
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/src/configuration.st b/templates/working/templates/axsharpblazor/ax/src/configuration.st
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/src/configuration.st
rename to templates/working/templates/axsharpblazor/ax/src/configuration.st
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/src/counters.st b/templates/working/templates/axsharpblazor/ax/src/counters.st
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/src/counters.st
rename to templates/working/templates/axsharpblazor/ax/src/counters.st
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/src/program.st b/templates/working/templates/axsharpblazor/ax/src/program.st
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/src/program.st
rename to templates/working/templates/axsharpblazor/ax/src/program.st
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/test/test.st b/templates/working/templates/axsharpblazor/ax/test/test.st
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/test/test.st
rename to templates/working/templates/axsharpblazor/ax/test/test.st
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/App.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/App.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/App.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/App.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Account/LogOut.cshtml b/templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Account/LogOut.cshtml
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Account/LogOut.cshtml
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Account/LogOut.cshtml
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Shared/_LoginPartial.cshtml b/templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/ApplicationDbContext.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Data/ApplicationDbContext.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/ApplicationDbContext.cs
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Data/ApplicationDbContext.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.cs
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/ApplicationDbContextModelSnapshot.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/ApplicationDbContextModelSnapshot.cs
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/ApplicationDbContextModelSnapshot.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml.cs
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor.css
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor.css
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor.css
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/AutoUI.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/AutoUI.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/AutoUI.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/AutoUI.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/ManualUI.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/ManualUI.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/ManualUI.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/ManualUI.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/_Host.cshtml b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/_Host.cshtml
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/_Host.cshtml
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/_Host.cshtml
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Program.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Program.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Program.cs
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Program.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/launchSettings.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/launchSettings.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/launchSettings.json
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/launchSettings.json
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.json
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.json
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.local.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.local.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.local.json
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.local.json
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/IAmHereIndicator.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/IAmHereIndicator.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/IAmHereIndicator.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/IAmHereIndicator.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/LoginDisplay.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/LoginDisplay.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/LoginDisplay.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/LoginDisplay.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor.css
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor.css
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor.css
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor.css
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor.css
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor.css
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor.css
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor.css
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor.css
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor.css
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor.css
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor.css
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor.css
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor.css
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor.css
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/_Imports.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/_Imports.razor
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/_Imports.razor
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/_Imports.razor
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.Development.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.Development.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.Development.json
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.Development.json
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.json
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.json
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css.map b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css.map
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css.map
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css.map
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/FONT-LICENSE b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/FONT-LICENSE
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/FONT-LICENSE
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/FONT-LICENSE
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/ICON-LICENSE b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/ICON-LICENSE
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/ICON-LICENSE
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/ICON-LICENSE
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/README.md b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/README.md
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/README.md
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/README.md
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.eot
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.eot
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.eot
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.otf
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.otf
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.otf
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.svg
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.svg
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.svg
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.woff
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.woff
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.woff
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/site.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/site.css
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/site.css
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/site.css
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/favicon.png b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/favicon.png
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/favicon.png
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/favicon.png
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-header.svg b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-header.svg
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-header.svg
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-header.svg
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-no-background.svg b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-no-background.svg
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-no-background.svg
rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-no-background.svg
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.sln b/templates/working/templates/axsharpblazor/axsharpblazor.sln
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.sln
rename to templates/working/templates/axsharpblazor/axsharpblazor.sln
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/Entry.cs b/templates/working/templates/axsharpblazor/axsharpblazor.twin/Entry.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/Entry.cs
rename to templates/working/templates/axsharpblazor/axsharpblazor.twin/Entry.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj
rename to templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj
rename to templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/install.cmd b/templates/working/templates/axsharpblazor/install.cmd
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/install.cmd
rename to templates/working/templates/axsharpblazor/install.cmd
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/install.ps1 b/templates/working/templates/axsharpblazor/install.ps1
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/install.ps1
rename to templates/working/templates/axsharpblazor/install.ps1
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj
rename to templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/.config/dotnet-tools.json b/templates/working/templates/axsharpconsole/.config/dotnet-tools.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/.config/dotnet-tools.json
rename to templates/working/templates/axsharpconsole/.config/dotnet-tools.json
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/.template.config/template.json b/templates/working/templates/axsharpconsole/.template.config/template.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/.template.config/template.json
rename to templates/working/templates/axsharpconsole/.template.config/template.json
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/README.md b/templates/working/templates/axsharpconsole/README.md
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/README.md
rename to templates/working/templates/axsharpconsole/README.md
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/.gitignore b/templates/working/templates/axsharpconsole/ax/.gitignore
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/.gitignore
rename to templates/working/templates/axsharpconsole/ax/.gitignore
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/.vscode/launch.json b/templates/working/templates/axsharpconsole/ax/.vscode/launch.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/.vscode/launch.json
rename to templates/working/templates/axsharpconsole/ax/.vscode/launch.json
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/AXSharp.config.json b/templates/working/templates/axsharpconsole/ax/AXSharp.config.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/AXSharp.config.json
rename to templates/working/templates/axsharpconsole/ax/AXSharp.config.json
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/apax-lock.json b/templates/working/templates/axsharpconsole/ax/apax-lock.json
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/apax-lock.json
rename to templates/working/templates/axsharpconsole/ax/apax-lock.json
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/apax.yml b/templates/working/templates/axsharpconsole/ax/apax.yml
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/apax.yml
rename to templates/working/templates/axsharpconsole/ax/apax.yml
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/src/configuration.st b/templates/working/templates/axsharpconsole/ax/src/configuration.st
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/src/configuration.st
rename to templates/working/templates/axsharpconsole/ax/src/configuration.st
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/src/program.st b/templates/working/templates/axsharpconsole/ax/src/program.st
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/src/program.st
rename to templates/working/templates/axsharpconsole/ax/src/program.st
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/test/test.st b/templates/working/templates/axsharpconsole/ax/test/test.st
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/test/test.st
rename to templates/working/templates/axsharpconsole/ax/test/test.st
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.sln b/templates/working/templates/axsharpconsole/axsharpconsole.sln
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.sln
rename to templates/working/templates/axsharpconsole/axsharpconsole.sln
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/Entry.cs b/templates/working/templates/axsharpconsole/axsharpconsole.twin/Entry.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/Entry.cs
rename to templates/working/templates/axsharpconsole/axsharpconsole.twin/Entry.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj
rename to templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/Program.cs b/templates/working/templates/axsharpconsole/axsharpconsole/Program.cs
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/Program.cs
rename to templates/working/templates/axsharpconsole/axsharpconsole/Program.cs
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj b/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
rename to templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/install.cmd b/templates/working/templates/axsharpconsole/install.cmd
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/install.cmd
rename to templates/working/templates/axsharpconsole/install.cmd
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/install.ps1 b/templates/working/templates/axsharpconsole/install.ps1
similarity index 100%
rename from src/AXSharp.templates/working/templates/axsharpconsole/install.ps1
rename to templates/working/templates/axsharpconsole/install.ps1