diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Adobe/AIR/Basic Project.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Adobe/AIR/Basic Project.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Adobe/AIR/Basic Project.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Adobe/AIR/Basic Project.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Adobe/AIR/Images/Application_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Adobe/AIR/Images/Application_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Adobe/AIR/Images/Application_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Adobe/AIR/Images/Application_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Adobe/AIR/Images/Application_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Adobe/AIR/Images/Application_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Adobe/AIR/Images/Application_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Adobe/AIR/Images/Application_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/BlankProject.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/BlankProject.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/BlankProject.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/BlankProject.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Blink.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Blink.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Blink.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Blink.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blank.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blank.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blank.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blank.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blank_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blank_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blank_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blank_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blank_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blank_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blank_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blank_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blink.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blink.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blink.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blink.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blink.xcf b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blink.xcf
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blink.xcf
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blink.xcf
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blink_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blink_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blink_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blink_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blink_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blink_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Arduino/Images/Blink_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Arduino/Images/Blink_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/C/GTK+ Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/C/GTK+ Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/C/GTK+ Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/C/GTK+ Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Class Library.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Class Library.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Class Library.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Class Library.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Console Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Console Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Console Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Console Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Database.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Database.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Database.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Database.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Application_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Application_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Application_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Application_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Application_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Application_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Application_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Application_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Blank_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Blank_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Blank_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Blank_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Blank_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Blank_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Blank_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Blank_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/COBOL.xcf b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/COBOL.xcf
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/COBOL.xcf
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/COBOL.xcf
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Console_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Console_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Console_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Console_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Console_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Console_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Console_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Console_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/ControlLibrary_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/ControlLibrary_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/ControlLibrary_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/ControlLibrary_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/ControlLibrary_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/ControlLibrary_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/ControlLibrary_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/ControlLibrary_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Database_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Database_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Database_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Database_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Database_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Database_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Database_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Database_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Library_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Library_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Library_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Library_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Library_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Library_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Library_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Library_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Service_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Service_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Service_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Service_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Service_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Service_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Service_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Service_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Silverlight_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Silverlight_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Silverlight_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Silverlight_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Silverlight_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Silverlight_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Silverlight_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Images/Silverlight_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Silverlight.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Silverlight.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Silverlight.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Silverlight.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Windows Forms Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Windows Forms Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/COBOL/Windows Forms Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/COBOL/Windows Forms Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Class Library.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Class Library.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Class Library.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Class Library.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Console Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Console Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Console Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Console Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Database.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Database.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Database.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Database.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application.xcf b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application.xcf
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application.xcf
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application.xcf
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Application_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank.xcf b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank.xcf
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank.xcf
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank.xcf
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Blank_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console.xcf b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console.xcf
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console.xcf
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console.xcf
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Console_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/ControlLibrary_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/ControlLibrary_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/ControlLibrary_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/ControlLibrary_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/ControlLibrary_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/ControlLibrary_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/ControlLibrary_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/ControlLibrary_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Database_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Database_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Database_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Database_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Database_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Database_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Database_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Database_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library.xcf b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library.xcf
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library.xcf
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library.xcf
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Library_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Silverlight_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Silverlight_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Silverlight_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Silverlight_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Silverlight_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Silverlight_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Silverlight_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Silverlight_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Test_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Test_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Test_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Test_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Test_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Test_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Test_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Images/Test_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Silverlight.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Silverlight.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Silverlight.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Silverlight.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Windows Forms Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Windows Forms Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/CSharp/Windows Forms Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/CSharp/Windows Forms Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Console Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Console Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Console Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Console Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Application_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Application_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Application_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Application_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Application_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Application_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Application_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Application_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Blank_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Blank_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Blank_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Blank_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Blank_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Blank_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Blank_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Blank_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Console_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Console_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Console_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Console_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Console_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Console_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Console_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Console_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Library_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Library_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Library_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Library_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Library_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Library_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Library_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Images/Library_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Native Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Native Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Native Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Native Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Windows Forms Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Windows Forms Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/IronPython/Windows Forms Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/IronPython/Windows Forms Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Console Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Console Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Console Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Console Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Application_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Application_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Application_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Application_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Application_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Application_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Application_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Application_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Blank_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Blank_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Blank_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Blank_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Blank_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Blank_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Blank_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Blank_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Console_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Console_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Console_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Console_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Console_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Console_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Console_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Console_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/ControlLibrary_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/ControlLibrary_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/ControlLibrary_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/ControlLibrary_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/ControlLibrary_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/ControlLibrary_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/ControlLibrary_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/ControlLibrary_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Library_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Library_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Library_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Library_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Library_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Library_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Library_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Images/Library_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Windows Forms Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Windows Forms Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/JSharp/Windows Forms Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/JSharp/Windows Forms Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Class Library.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Class Library.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Class Library.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Class Library.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Console Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Console Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Console Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Console Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Database.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Database.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Database.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Database.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Application_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Application_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Application_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Application_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Application_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Application_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Application_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Application_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Blank_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Blank_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Blank_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Blank_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Blank_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Blank_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Blank_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Blank_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Console_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Console_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Console_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Console_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Console_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Console_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Console_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Console_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/ControlLibrary_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/ControlLibrary_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/ControlLibrary_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/ControlLibrary_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/ControlLibrary_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/ControlLibrary_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/ControlLibrary_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/ControlLibrary_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Database_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Database_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Database_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Database_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Database_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Database_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Database_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Database_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Library_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Library_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Library_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Library_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Library_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Library_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Library_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Library_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Service_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Service_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Service_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Service_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Service_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Service_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Service_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Service_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/SliverlightApplication_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/SliverlightApplication_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/SliverlightApplication_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/SliverlightApplication_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/SliverlightApplication_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/SliverlightApplication_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/SliverlightApplication_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/SliverlightApplication_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Test_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Test_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Test_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Test_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Test_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Test_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Test_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Images/Test_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Silverlight.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Silverlight.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Silverlight.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Silverlight.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Windows Forms Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Windows Forms Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Windows Forms Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Common Language Runtime/VisualBasic/Windows Forms Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Extensibility/Images/MSOfficeAddin_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Extensibility/Images/MSOfficeAddin_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Extensibility/Images/MSOfficeAddin_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Extensibility/Images/MSOfficeAddin_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Extensibility/Images/MSOfficeAddin_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Extensibility/Images/MSOfficeAddin_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Extensibility/Images/MSOfficeAddin_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Extensibility/Images/MSOfficeAddin_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Extensibility/Images/UniversalEditorAddin_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Extensibility/Images/UniversalEditorAddin_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Extensibility/Images/UniversalEditorAddin_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Extensibility/Images/UniversalEditorAddin_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Extensibility/Images/UniversalEditorAddin_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Extensibility/Images/UniversalEditorAddin_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Extensibility/Images/UniversalEditorAddin_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Extensibility/Images/UniversalEditorAddin_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Blank Project.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Blank Project.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Blank Project.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Blank Project.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Class Library.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Class Library.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Class Library.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Class Library.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Console Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Console Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Console Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Console Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/GUI Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/GUI Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/GUI Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/GUI Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Application_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Application_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Application_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Application_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Application_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Application_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Application_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Application_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Blank_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Blank_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Blank_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Blank_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Blank_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Blank_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Blank_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Blank_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Console_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Console_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Console_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Console_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Console_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Console_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Console_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Console_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Library_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Library_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Library_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Library_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Library_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Library_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Pascal/Images/Library_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Pascal/Images/Library_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/ActiveX Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/ActiveX Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/ActiveX Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/ActiveX Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Blank Project.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Blank Project.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Blank Project.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Blank Project.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Class Library.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Class Library.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Class Library.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Class Library.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Control Library.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Control Library.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Control Library.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Control Library.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/ActiveXApplication_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/ActiveXApplication_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/ActiveXApplication_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/ActiveXApplication_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/ActiveXApplication_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/ActiveXApplication_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/ActiveXApplication_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/ActiveXApplication_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Application_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Application_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Application_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Application_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Application_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Application_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Application_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Application_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/BlankProject_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/BlankProject_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/BlankProject_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/BlankProject_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/BlankProject_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/BlankProject_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/BlankProject_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/BlankProject_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/ControlLibrary_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/ControlLibrary_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/ControlLibrary_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/ControlLibrary_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/ControlLibrary_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/ControlLibrary_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/ControlLibrary_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/ControlLibrary_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Library_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Library_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Library_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Library_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Library_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Library_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Library_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Library_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Wizard_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Wizard_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Wizard_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Wizard_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Wizard_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Wizard_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Images/Wizard_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Images/Wizard_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Standard Application.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Standard Application.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Software Development/Visual Basic 6.0/Standard Application.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Templates/Project/Software Development/Visual Basic 6.0/Standard Application.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/HTMLPage.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/HTMLPage.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/HTMLPage.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/HTMLPage.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/HTMLPage.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/HTMLPage.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/HTMLPage.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/HTMLPage.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/MasterPage.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/MasterPage.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/MasterPage.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/MasterPage.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/MasterPage.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/MasterPage.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/MasterPage.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/MasterPage.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/TravelRequest.xsn b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/TravelRequest.xsn
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/TravelRequest.xsn
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/TravelRequest.xsn
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebForm.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebForm.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebForm.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebForm.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebForm.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebForm.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebForm.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebForm.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebService.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebService.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebService.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebService.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebService.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebService.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebService.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebService.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebUserControl.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebUserControl.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebUserControl.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebUserControl.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebUserControl.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebUserControl.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Web/WebUserControl.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Document/Web/WebUserControl.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ASP.NET/IronPython/Images/Website_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ASP.NET/IronPython/Images/Website_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ASP.NET/IronPython/Images/Website_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ASP.NET/IronPython/Images/Website_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ASP.NET/IronPython/Images/Website_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ASP.NET/IronPython/Images/Website_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ASP.NET/IronPython/Images/Website_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ASP.NET/IronPython/Images/Website_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ASP.NET/IronPython/IronPython Web Project.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ASP.NET/IronPython/IronPython Web Project.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ASP.NET/IronPython/IronPython Web Project.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ASP.NET/IronPython/IronPython Web Project.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/ColdFusion Project.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/ColdFusion Project.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/ColdFusion Project.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/ColdFusion Project.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/Images/Project.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/Images/Project.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/Images/Project.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/Images/Project.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/Images/Project.xcf b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/Images/Project.xcf
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/Images/Project.xcf
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/Images/Project.xcf
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/Images/Project_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/Images/Project_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/Images/Project_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/Images/Project_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/Images/Project_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/Images/Project_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/ColdFusion/Images/Project_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/ColdFusion/Images/Project_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/MainIcon.ico b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/MainIcon.ico
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/MainIcon.ico
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/MainIcon.ico
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/MainIcon.xcf b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/MainIcon.xcf
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/MainIcon.xcf
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/MainIcon.xcf
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/MainIcon_16x16.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/MainIcon_16x16.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/MainIcon_16x16.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/MainIcon_16x16.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/MainIcon_32x32.png b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/MainIcon_32x32.png
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/MainIcon_32x32.png
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/MainIcon_32x32.png
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/PHP Web Project.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/PHP Web Project.xml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/PHP Web Project.xml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/WebsiteDeveloper/Templates/Project/Website Development/PHP/PHP Web Project.xml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Software Development/Websites/PHP/PHP Web Project.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Software Development/Websites/PHP/PHP Web Project.xml
deleted file mode 100644
index 9fa93939..00000000
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Software Development/Websites/PHP/PHP Web Project.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE UniversalEditor SYSTEM "U:\Doctypes\UniversalEditor.dtd">
-<UniversalEditor Version="3.0">
-	<Templates>
-		<Project TypeID="{A0786B88-2ADB-4C21-ABE8-AA2D79766269}">
-			<Information>
-				<Title></Title>
-				<Path>
-					<Part>Application Development</Part>
-					<Part>Websites</Part>
-					<Part>PHP</Part>
-				</Path>
-			</Information>
-			<FileSystem>
-				<Files>
-					<File Destination="index.php">
-						<Content Type="text/plain"><![CDATA[<?php
-
-echo "Hello World!";
-
-?>]]></Content>
-					</File>
-				</Files>
-			</FileSystem>
-		</Project>
-	</Templates>
-</UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/Joomla Project.xml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/Joomla Project.xml
deleted file mode 100644
index ec782764..00000000
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Project/Website Development/PHP/Joomla Project.xml	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE UniversalEditor SYSTEM "U:\Doctypes\UniversalEditor.dtd">
-<UniversalEditor Version="3.0">
-	<ProjectTemplates>
-		<ProjectTemplate ID="{F1C7F194-6E83-4739-AF38-299D79461CB7}" TypeID="{A0786B88-2ADB-4C21-ABE8-AA2D79766269}">
-			<Information>
-				<Title>Joomla! Project</Title>
-				<IconPath LargeFileName="MainIcon_32x32.png" SmallFileName="MainIcon_16x16.png" />
-				<Path>
-					<Part>Website Development</Part>
-					<Part>PHP</Part>
-				</Path>
-			</Information>
-			<FileSystem>
-				<Files>
-					<File Destination="index.php">
-						<Content Type="text/plain"><![CDATA[<?php
-
-echo "Hello World!";
-
-?>]]></Content>
-					</File>
-				</Files>
-			</FileSystem>
-		</ProjectTemplate>
-	</ProjectTemplates>
-</UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
index f5d4fc62..97dc74aa 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
@@ -121,17 +121,16 @@
     <Content Include="Templates\Document\Form\Meeting Agenda.xml" />
     <Content Include="Templates\Document\Form\Status Report.xml" />
     <Content Include="Templates\Document\Form\Travel Request.xml" />
-    <Content Include="Templates\Document\Software Development\Websites\PHP\PHP Web Project.xml" />
-    <Content Include="Templates\Document\Web\HTMLPage.ico" />
-    <Content Include="Templates\Document\Web\HTMLPage.xml" />
-    <Content Include="Templates\Document\Web\MasterPage.ico" />
-    <Content Include="Templates\Document\Web\MasterPage.xml" />
-    <Content Include="Templates\Document\Web\WebForm.ico" />
-    <Content Include="Templates\Document\Web\WebForm.xml" />
-    <Content Include="Templates\Document\Web\WebService.ico" />
-    <Content Include="Templates\Document\Web\WebService.xml" />
-    <Content Include="Templates\Document\Web\WebUserControl.ico" />
-    <Content Include="Templates\Document\Web\WebUserControl.xml" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\HTMLPage.ico" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\HTMLPage.xml" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\MasterPage.ico" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\MasterPage.xml" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\WebForm.ico" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\WebForm.xml" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\WebService.ico" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\WebService.xml" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\WebUserControl.ico" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Document\Web\WebUserControl.xml" />
     <Content Include="Templates\Project\AutoDesk\Images\AutoCAD_16x16.png" />
     <Content Include="Templates\Project\AutoDesk\Images\AutoCAD_32x32.png" />
     <Content Include="Templates\Project\AutoDesk\Images\Inventor_16x16.png" />
@@ -157,154 +156,154 @@
     <Content Include="Templates\Project\File Distribution\Images\Torrent.ico" />
     <Content Include="Templates\Project\File Distribution\Images\Torrent_16x16.png" />
     <Content Include="Templates\Project\File Distribution\Images\Torrent_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Adobe\AIR\Basic Project.xml" />
-    <Content Include="Templates\Project\Software Development\Adobe\AIR\Images\Application_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Adobe\AIR\Images\Application_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Arduino\BlankProject.xml" />
-    <Content Include="Templates\Project\Software Development\Arduino\Blink.xml" />
-    <Content Include="Templates\Project\Software Development\Arduino\Images\Blank.ico" />
-    <Content Include="Templates\Project\Software Development\Arduino\Images\Blank_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Arduino\Images\Blank_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Arduino\Images\Blink.ico" />
-    <Content Include="Templates\Project\Software Development\Arduino\Images\Blink_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Arduino\Images\Blink_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Class Library.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Console Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Database.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Application_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Application_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Blank_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Blank_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Console_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Console_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\ControlLibrary_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\ControlLibrary_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Database_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Database_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Library_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Library_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Service_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Service_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Silverlight_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Silverlight_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Silverlight.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Windows Forms Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Class Library.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Console Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Database.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Application.ico" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Application_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Application_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Blank.ico" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Blank_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Blank_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Console.ico" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Console_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Console_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\ControlLibrary_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\ControlLibrary_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Database_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Database_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Library.ico" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Library_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Library_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Silverlight_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Silverlight_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Test_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Test_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Silverlight.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Windows Forms Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Console Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Application_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Application_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Blank_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Blank_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Console_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Console_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Library_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Library_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Native Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\IronPython\Windows Forms Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Console Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Application_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Application_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Blank_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Blank_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Console_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Console_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\ControlLibrary_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\ControlLibrary_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Library_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Library_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\JSharp\Windows Forms Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Class Library.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Console Application.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Database.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Application_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Application_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Blank_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Blank_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Console_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Console_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\ControlLibrary_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\ControlLibrary_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Database_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Database_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Library_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Library_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Service_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Service_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\SliverlightApplication_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\SliverlightApplication_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Test_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Test_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Silverlight.xml" />
-    <Content Include="Templates\Project\Software Development\Common Language Runtime\VisualBasic\Windows Forms Application.xml" />
-    <Content Include="Templates\Project\Software Development\C\GTK+ Application.xml" />
-    <Content Include="Templates\Project\Software Development\Extensibility\Images\MSOfficeAddin_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Extensibility\Images\MSOfficeAddin_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Extensibility\Images\UniversalEditorAddin_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Extensibility\Images\UniversalEditorAddin_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Pascal\Blank Project.xml" />
-    <Content Include="Templates\Project\Software Development\Pascal\Class Library.xml" />
-    <Content Include="Templates\Project\Software Development\Pascal\Console Application.xml" />
-    <Content Include="Templates\Project\Software Development\Pascal\GUI Application.xml" />
-    <Content Include="Templates\Project\Software Development\Pascal\Images\Application_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Pascal\Images\Application_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Pascal\Images\Blank_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Pascal\Images\Blank_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Pascal\Images\Console_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Pascal\Images\Console_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Pascal\Images\Library_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Pascal\Images\Library_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\ActiveX Application.xml" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Blank Project.xml" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Class Library.xml" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Control Library.xml" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\ActiveXApplication_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\ActiveXApplication_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\Application_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\Application_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\BlankProject_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\BlankProject_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\ControlLibrary_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\ControlLibrary_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\Library_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\Library_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\Wizard_16x16.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Images\Wizard_32x32.png" />
-    <Content Include="Templates\Project\Software Development\Visual Basic 6.0\Standard Application.xml" />
-    <Content Include="Templates\Project\Website Development\ASP.NET\IronPython\Images\Website_16x16.png" />
-    <Content Include="Templates\Project\Website Development\ASP.NET\IronPython\Images\Website_32x32.png" />
-    <Content Include="Templates\Project\Website Development\ASP.NET\IronPython\IronPython Web Project.xml" />
-    <Content Include="Templates\Project\Website Development\ColdFusion\ColdFusion Project.xml" />
-    <Content Include="Templates\Project\Website Development\ColdFusion\Images\Project.ico" />
-    <Content Include="Templates\Project\Website Development\ColdFusion\Images\Project_16x16.png" />
-    <Content Include="Templates\Project\Website Development\ColdFusion\Images\Project_32x32.png" />
-    <Content Include="Templates\Project\Website Development\PHP\MainIcon.ico" />
-    <Content Include="Templates\Project\Website Development\PHP\MainIcon_16x16.png" />
-    <Content Include="Templates\Project\Website Development\PHP\MainIcon_32x32.png" />
-    <Content Include="Templates\Project\Website Development\PHP\PHP Web Project.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Adobe\AIR\Basic Project.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Adobe\AIR\Images\Application_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Adobe\AIR\Images\Application_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\BlankProject.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Blink.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Images\Blank.ico" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Images\Blank_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Images\Blank_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Images\Blink.ico" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Images\Blink_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Images\Blink_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Class Library.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Console Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Database.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Application_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Application_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Blank_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Blank_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Console_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Console_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\ControlLibrary_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\ControlLibrary_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Database_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Database_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Library_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Library_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Service_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Service_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Silverlight_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\Silverlight_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Silverlight.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Windows Forms Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Class Library.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Console Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Database.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Application.ico" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Application_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Application_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Blank.ico" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Blank_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Blank_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Console.ico" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Console_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Console_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\ControlLibrary_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\ControlLibrary_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Database_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Database_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Library.ico" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Library_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Library_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Silverlight_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Silverlight_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Test_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Test_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Silverlight.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Windows Forms Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Console Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Application_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Application_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Blank_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Blank_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Console_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Console_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Library_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Images\Library_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Native Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\IronPython\Windows Forms Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Console Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Application_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Application_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Blank_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Blank_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Console_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Console_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\ControlLibrary_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\ControlLibrary_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Library_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Images\Library_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\JSharp\Windows Forms Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Class Library.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Console Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Database.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Application_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Application_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Blank_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Blank_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Console_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Console_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\ControlLibrary_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\ControlLibrary_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Database_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Database_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Library_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Library_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Service_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Service_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\SliverlightApplication_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\SliverlightApplication_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Test_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Images\Test_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Silverlight.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\VisualBasic\Windows Forms Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\C\GTK+ Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Extensibility\Images\MSOfficeAddin_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Extensibility\Images\MSOfficeAddin_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Extensibility\Images\UniversalEditorAddin_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Extensibility\Images\UniversalEditorAddin_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Blank Project.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Class Library.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Console Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\GUI Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Images\Application_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Images\Application_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Images\Blank_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Images\Blank_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Images\Console_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Images\Console_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Images\Library_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Pascal\Images\Library_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\ActiveX Application.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Blank Project.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Class Library.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Control Library.xml" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\ActiveXApplication_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\ActiveXApplication_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\Application_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\Application_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\BlankProject_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\BlankProject_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\ControlLibrary_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\ControlLibrary_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\Library_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\Library_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\Wizard_16x16.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Images\Wizard_32x32.png" />
+    <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Visual Basic 6.0\Standard Application.xml" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\ASP.NET\IronPython\Images\Website_16x16.png" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\ASP.NET\IronPython\Images\Website_32x32.png" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\ASP.NET\IronPython\IronPython Web Project.xml" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\ColdFusion\ColdFusion Project.xml" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\ColdFusion\Images\Project.ico" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\ColdFusion\Images\Project_16x16.png" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\ColdFusion\Images\Project_32x32.png" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\PHP\MainIcon.ico" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\PHP\MainIcon_16x16.png" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\PHP\MainIcon_32x32.png" />
+    <Content Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\PHP\PHP Web Project.xml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Configuration\Application.upl" />
@@ -312,21 +311,21 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Editors\UniversalEditor.UserInterface.WindowsForms.Editors.DatabaseEditor\Images\Icons\" />
-    <Folder Include="Templates\Project\Software Development\Addins\" />
+    <Folder Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Addins\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Templates\Document\Web\TravelRequest.xsn" />
+    <None Include="Extensions\WebsiteDeveloper\Templates\Document\Web\TravelRequest.xsn" />
     <None Include="Templates\Project\Concertroid\Images\Concert.xcf" />
     <None Include="Templates\Project\Concertroid\Images\Library.xcf" />
     <None Include="Templates\Project\File Distribution\Images\Torrent.xcf" />
-    <None Include="Templates\Project\Software Development\Arduino\Images\Blink.xcf" />
-    <None Include="Templates\Project\Software Development\Common Language Runtime\COBOL\Images\COBOL.xcf" />
-    <None Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Application.xcf" />
-    <None Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Blank.xcf" />
-    <None Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Console.xcf" />
-    <None Include="Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Library.xcf" />
-    <None Include="Templates\Project\Website Development\ColdFusion\Images\Project.xcf" />
-    <None Include="Templates\Project\Website Development\PHP\MainIcon.xcf" />
+    <None Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Images\Blink.xcf" />
+    <None Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\COBOL\Images\COBOL.xcf" />
+    <None Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Application.xcf" />
+    <None Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Blank.xcf" />
+    <None Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Console.xcf" />
+    <None Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Common Language Runtime\CSharp\Images\Library.xcf" />
+    <None Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\ColdFusion\Images\Project.xcf" />
+    <None Include="Extensions\WebsiteDeveloper\Templates\Project\Website Development\PHP\MainIcon.xcf" />
   </ItemGroup>
   <Target Name="Build">
     <Copy SourceFiles="@(Content)" DestinationFiles="@(Content->'$(OutputPath)%(RelativeDir)%(Filename)%(Extension)')" />