diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/CheckMissing.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/CheckMissing.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/CheckMissing.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/CheckMissing.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/GladeDesktopApplication.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/GladeDesktopApplication.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/GladeDesktopApplication.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/GladeDesktopApplication.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/GladeDisplayBindings.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/GladeDisplayBindings.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/GladeDisplayBindings.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/GladeDisplayBindings.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.csproj b/Source/Addins/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.csproj
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.csproj
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.csproj
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Properties/AddinInfo.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/Properties/AddinInfo.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Properties/AddinInfo.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Properties/AddinInfo.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Properties/AssemblyInfo.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/Properties/AssemblyInfo.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Properties/AssemblyInfo.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Properties/AssemblyInfo.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Properties/Manifest.addin.xml b/Source/Addins/MonoDevelop.GtkSharp.Addin/Properties/Manifest.addin.xml
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Properties/Manifest.addin.xml
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Properties/Manifest.addin.xml
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Dialog.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Dialog.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Dialog.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Dialog.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Dialog.glade b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Dialog.glade
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Dialog.glade
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Dialog.glade
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Widget.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Widget.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Widget.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Widget.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Widget.glade b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Widget.glade
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Widget.glade
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Widget.glade
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Window.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Window.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Window.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Window.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Window.glade b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Window.glade
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Window.glade
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Data/Window.glade
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Dialog.CS.xft.xml b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Dialog.CS.xft.xml
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Dialog.CS.xft.xml
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Dialog.CS.xft.xml
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Widget.CS.xft.xml b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Widget.CS.xft.xml
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Widget.CS.xft.xml
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Widget.CS.xft.xml
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Window.CS.xft.xml b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Window.CS.xft.xml
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/File/Window.CS.xft.xml
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/File/Window.CS.xft.xml
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/MainWindow.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/MainWindow.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/MainWindow.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/MainWindow.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/MainWindow.glade b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/MainWindow.glade
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/MainWindow.glade
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/MainWindow.glade
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/Program.cs b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/Program.cs
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/Program.cs
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/Data/Program.cs
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/GtkSharpProject.CS.xpt.xml b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/GtkSharpProject.CS.xpt.xml
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/GtkSharpProject.CS.xpt.xml
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/GtkSharpProject.CS.xpt.xml
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/GtkSharpProject.FS.xpt.xml b/Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/GtkSharpProject.FS.xpt.xml
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/Templates/Projects/GtkSharpProject.FS.xpt.xml
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/Projects/GtkSharpProject.FS.xpt.xml
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/glade.sh b/Source/Addins/MonoDevelop.GtkSharp.Addin/glade.sh
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/glade.sh
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/glade.sh
diff --git a/Source/Templates/MonoDevelop.GtkSharp.Addin/packages.config b/Source/Addins/MonoDevelop.GtkSharp.Addin/packages.config
similarity index 100%
rename from Source/Templates/MonoDevelop.GtkSharp.Addin/packages.config
rename to Source/Addins/MonoDevelop.GtkSharp.Addin/packages.config
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec b/Source/Templates/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
rename to Source/Templates/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.cs b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.cs
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.cs
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.cs
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.glade b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.glade
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.glade
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/MainWindow.glade
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/Program.cs b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/Program.cs
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/Program.cs
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/Program.cs
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/.template.config/template.json b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/.template.config/template.json
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/.template.config/template.json
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/.template.config/template.json
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.cs b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.cs
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.cs
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.cs
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.glade b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.glade
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.glade
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Dialog.CSharp/Gtk_Dialog.glade
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/.template.config/template.json b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/.template.config/template.json
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/.template.config/template.json
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/.template.config/template.json
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.cs b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.cs
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.cs
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.cs
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.glade b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.glade
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.glade
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Widget.CSharp/Gtk_Widget.glade
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/.template.config/template.json b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/.template.config/template.json
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/.template.config/template.json
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/.template.config/template.json
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.cs b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.cs
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.cs
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.cs
diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.glade b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.glade
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.glade
rename to Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Window.CSharp/Gtk_Window.glade
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/GtkSharp.Template.VBNet.nuspec b/Source/Templates/GtkSharp.Template.VBNet/GtkSharp.Template.VBNet.nuspec
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/GtkSharp.Template.VBNet.nuspec
rename to Source/Templates/GtkSharp.Template.VBNet/GtkSharp.Template.VBNet.nuspec
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/GtkNamespace.vbproj b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/GtkNamespace.vbproj
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/GtkNamespace.vbproj
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/GtkNamespace.vbproj
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/MainWindow.glade b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/MainWindow.glade
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/MainWindow.glade
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/MainWindow.glade
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/MainWindow.vb b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/MainWindow.vb
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/MainWindow.vb
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/MainWindow.vb
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/Program.vb b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/Program.vb
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/Program.vb
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/Program.vb
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/.template.config/template.json b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/.template.config/template.json
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/.template.config/template.json
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/.template.config/template.json
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/Gtk_Dialog.glade b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/Gtk_Dialog.glade
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/Gtk_Dialog.glade
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/Gtk_Dialog.glade
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/Gtk_Dialog.vb b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/Gtk_Dialog.vb
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/Gtk_Dialog.vb
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Dialog.VBNet/Gtk_Dialog.vb
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/.template.config/template.json b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/.template.config/template.json
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/.template.config/template.json
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/.template.config/template.json
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/Gtk_Widget.glade b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/Gtk_Widget.glade
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/Gtk_Widget.glade
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/Gtk_Widget.glade
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/Gtk_Widget.vb b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/Gtk_Widget.vb
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/Gtk_Widget.vb
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Widget.VBNet/Gtk_Widget.vb
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/.template.config/template.json b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/.template.config/template.json
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/.template.config/template.json
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/.template.config/template.json
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/Gtk_Window.glade b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/Gtk_Window.glade
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/Gtk_Window.glade
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/Gtk_Window.glade
diff --git a/Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/Gtk_Window.vb b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/Gtk_Window.vb
similarity index 100%
rename from Source/Templates/NetCore/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/Gtk_Window.vb
rename to Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Window.VBNet/Gtk_Window.vb
diff --git a/build.cake b/build.cake
index 245cf898e..ed79b9934 100755
--- a/build.cake
+++ b/build.cake
@@ -121,11 +121,11 @@ Task("PackageTemplates")
         Version = Settings.Version
     };
 
-    settings.BasePath = "Source/Templates/NetCore/GtkSharp.Template.CSharp";
-    NuGetPack("Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec", settings);
+    settings.BasePath = "Source/Templates/GtkSharp.Template.CSharp";
+    NuGetPack("Source/Templates/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec", settings);
 
-    settings.BasePath = "Source/Templates/NetCore/GtkSharp.Template.VBNet";
-    NuGetPack("Source/Templates/NetCore/GtkSharp.Template.VBNet/GtkSharp.Template.VBNet.nuspec", settings);
+    settings.BasePath = "Source/Templates/GtkSharp.Template.VBNet";
+    NuGetPack("Source/Templates/GtkSharp.Template.VBNet/GtkSharp.Template.VBNet.nuspec", settings);
 });
 
 // TASK TARGETS