diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/AdaCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/AdaCodeDataFormat.cs
similarity index 98%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/AdaCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/AdaCodeDataFormat.cs
index 309f4a7b..2b970942 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/AdaCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/AdaCodeDataFormat.cs
@@ -10,7 +10,7 @@ using UniversalEditor.ObjectModels.SourceCode;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements.CodeLoopActionElements;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
     public class AdaCodeDataFormat : CodeDataFormat
     {
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/BooCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/BooCodeDataFormat.cs
similarity index 91%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/BooCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/BooCodeDataFormat.cs
index 628bb916..c650168c 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/BooCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/BooCodeDataFormat.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 using UniversalEditor;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
     public class BooCodeDataFormat : CodeDataFormat
     {
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/CCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CCodeDataFormat.cs
similarity index 99%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/CCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CCodeDataFormat.cs
index a68d0181..18e0df7f 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/CCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CCodeDataFormat.cs
@@ -7,7 +7,7 @@ using UniversalEditor.ObjectModels.SourceCode;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements.CodeLoopActionElements;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
     public class CCodeDataFormat : CodeDataFormat
     {
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/COBOLCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/COBOLCodeDataFormat.cs
similarity index 92%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/COBOLCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/COBOLCodeDataFormat.cs
index 19a77df9..9c65f7c0 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/COBOLCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/COBOLCodeDataFormat.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 using UniversalEditor;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
     public class COBOLCodeDataFormat : CodeDataFormat
     {
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/CSharpCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CSharpCodeDataFormat.cs
similarity index 99%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/CSharpCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CSharpCodeDataFormat.cs
index e65cb0c7..bdb4521a 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/CSharpCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CSharpCodeDataFormat.cs
@@ -8,7 +8,7 @@ using UniversalEditor.ObjectModels.SourceCode;
 using UniversalEditor.ObjectModels.SourceCode.CodeElementReferences;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
 	public class CSharpCodeDataFormat : CodeDataFormat
 	{
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/CodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CodeDataFormat.cs
similarity index 98%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/CodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CodeDataFormat.cs
index d58ed415..4443c8b4 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/CodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CodeDataFormat.cs
@@ -8,7 +8,7 @@ using UniversalEditor.IO;
 using UniversalEditor.ObjectModels.SourceCode;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
 	public abstract class CodeDataFormat : DataFormat
 	{
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/FORTRANCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FORTRANCodeDataFormat.cs
similarity index 92%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/FORTRANCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FORTRANCodeDataFormat.cs
index 6c0726ac..3ef8efc2 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/FORTRANCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FORTRANCodeDataFormat.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 using UniversalEditor;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
     public class FORTRANCodeDataFormat : CodeDataFormat
     {
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/FSharpCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FSharpCodeDataFormat.cs
similarity index 99%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/FSharpCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FSharpCodeDataFormat.cs
index 6acd3fa0..b25616ad 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/FSharpCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/FSharpCodeDataFormat.cs
@@ -9,7 +9,7 @@ using UniversalEditor.IO;
 using UniversalEditor.ObjectModels.SourceCode;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
     public class FSharpCodeDataFormat : CodeDataFormat
     {
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/GoCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/GoCodeDataFormat.cs
similarity index 96%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/GoCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/GoCodeDataFormat.cs
index b42069ea..3ad959de 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/GoCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/GoCodeDataFormat.cs
@@ -9,7 +9,7 @@ using UniversalEditor.IO;
 using UniversalEditor.ObjectModels.SourceCode;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
     public class GoCodeDataFormat : CodeDataFormat
     {
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/Java/JavaClassDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaClassDataFormat.cs
similarity index 99%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/Java/JavaClassDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaClassDataFormat.cs
index 30d12372..b0a81a6a 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/Java/JavaClassDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaClassDataFormat.cs
@@ -8,7 +8,7 @@ using UniversalEditor.ObjectModels.SourceCode;
 using UniversalEditor.IO;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements;
 
-namespace UniversalEditor.DataFormats.Programming.Java
+namespace UniversalEditor.DataFormats.SourceCode.Java
 {
 	public class JavaClassDataFormat : DataFormat
 	{
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/Java/JavaCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaCodeDataFormat.cs
similarity index 99%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/Java/JavaCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaCodeDataFormat.cs
index f1dae533..16d48179 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/Java/JavaCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/Java/JavaCodeDataFormat.cs
@@ -9,7 +9,7 @@ using UniversalEditor.ObjectModels.SourceCode.CodeElements.CodeLoopActionElement
 using UniversalEditor.ObjectModels.SourceCode.CodeElementReferences;
 using UniversalEditor.IO;
 
-namespace UniversalEditor.DataFormats.Programming.Java
+namespace UniversalEditor.DataFormats.SourceCode.Java
 {
     public class JavaCodeDataFormat : CodeDataFormat
     {
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/VisualBasicNETCodeDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/VisualBasicNETCodeDataFormat.cs
similarity index 99%
rename from CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/VisualBasicNETCodeDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/VisualBasicNETCodeDataFormat.cs
index 7077262b..1f600be7 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/Programming/VisualBasicNETCodeDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/VisualBasicNETCodeDataFormat.cs
@@ -8,7 +8,7 @@ using UniversalEditor.ObjectModels.SourceCode.CodeElementReferences;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements;
 using UniversalEditor.ObjectModels.SourceCode.CodeElements.CodeLoopActionElements;
 
-namespace UniversalEditor.DataFormats.Programming
+namespace UniversalEditor.DataFormats.SourceCode
 {
 	public class VisualBasicNETCodeDataFormat : CodeDataFormat
 	{
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/UniversalEditor.Plugins.SoftwareDevelopment.csproj b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/UniversalEditor.Plugins.SoftwareDevelopment.csproj
index 187a2367..a2443ee8 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/UniversalEditor.Plugins.SoftwareDevelopment.csproj
+++ b/CSharp/Plugins/UniversalEditor.Plugins.SoftwareDevelopment/UniversalEditor.Plugins.SoftwareDevelopment.csproj
@@ -38,24 +38,12 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DataFormats\Programming\Java\JavaCodeDataFormat.cs" />
     <Compile Include="ObjectModels\SourceCode\CodeElementReferences\CodeElementDynamicReference.cs" />
     <Compile Include="ObjectModels\SourceCode\CodeElements\CodeConditionalStatementActionElement.cs" />
     <Compile Include="ObjectModels\SourceCode\CodeElementReferences\CodeElementEnumerationValueReference.cs" />
     <Compile Include="ObjectModels\SourceCode\IAccessModifiableCodeElement.cs" />
     <Compile Include="ObjectModels\SourceCode\INamedCodeElement.cs" />
     <Compile Include="ObjectModels\SourceCode\SearchExpressions\CodeMethodCallActionSearch.cs" />
-    <Compile Include="DataFormats\Programming\AdaCodeDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\BooCodeDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\CCodeDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\COBOLCodeDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\CodeDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\CSharpCodeDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\FORTRANCodeDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\FSharpCodeDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\GoCodeDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\Java\JavaClassDataFormat.cs" />
-    <Compile Include="DataFormats\Programming\VisualBasicNETCodeDataFormat.cs" />
     <Compile Include="ObjectModels\ProgrammingLanguage\ProgrammingLanguageObjectModel.cs" />
     <Compile Include="ObjectModels\SourceCode\CodeAccessModifiers.cs" />
     <Compile Include="ObjectModels\SourceCode\CodeElement.cs" />
@@ -80,6 +68,18 @@
     <Compile Include="ObjectModels\SourceCode\CodeObjectModel.cs" />
     <Compile Include="ObjectModels\SourceCode\CodeDataType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="DataFormats\SourceCode\Java\JavaCodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\AdaCodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\BooCodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\CCodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\COBOLCodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\CodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\CSharpCodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\FORTRANCodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\FSharpCodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\GoCodeDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\Java\JavaClassDataFormat.cs" />
+    <Compile Include="DataFormats\SourceCode\VisualBasicNETCodeDataFormat.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Libraries\UniversalEditor.Core\UniversalEditor.Core.csproj">