diff --git a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestCloseBlockTest.cs b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestCloseBlockTest.cs
similarity index 99%
rename from test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestCloseBlockTest.cs
rename to test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestCloseBlockTest.cs
index 207e27ab..8d822e6b 100644
--- a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestCloseBlockTest.cs
+++ b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestCloseBlockTest.cs
@@ -8,7 +8,7 @@ using ZoneCodeGenerator.Parsing.C_Header.Blocks;
 using ZoneCodeGenerator.Parsing.C_Header.Tests;
 using ZoneCodeGenerator.Parsing.Testing;
 
-namespace ZoneCodeGeneratorTests.Parsing.Testing.Tests
+namespace ZoneCodeGeneratorTests.Parsing.C_Header.Tests
 {
     [TestClass]
     public class TestCloseBlockTest
diff --git a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestEnumMemberTest.cs b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestEnumMemberTest.cs
similarity index 99%
rename from test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestEnumMemberTest.cs
rename to test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestEnumMemberTest.cs
index 2167f86c..91300e07 100644
--- a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestEnumMemberTest.cs
+++ b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestEnumMemberTest.cs
@@ -10,7 +10,7 @@ using ZoneCodeGenerator.Parsing.C_Header.Blocks;
 using ZoneCodeGenerator.Parsing.C_Header.Tests;
 using ZoneCodeGenerator.Parsing.Testing;
 
-namespace ZoneCodeGeneratorTests.Parsing.Testing.Tests
+namespace ZoneCodeGeneratorTests.Parsing.C_Header.Tests
 {
     [TestClass]
     public class TestEnumMemberTest
diff --git a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestEnumTest.cs b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestEnumTest.cs
similarity index 99%
rename from test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestEnumTest.cs
rename to test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestEnumTest.cs
index 6dac654e..0fc60abb 100644
--- a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestEnumTest.cs
+++ b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestEnumTest.cs
@@ -9,7 +9,7 @@ using ZoneCodeGenerator.Parsing.C_Header.Blocks;
 using ZoneCodeGenerator.Parsing.C_Header.Tests;
 using ZoneCodeGenerator.Parsing.Testing;
 
-namespace ZoneCodeGeneratorTests.Parsing.Testing.Tests
+namespace ZoneCodeGeneratorTests.Parsing.C_Header.Tests
 {
     [TestClass]
     public class TestEnumTest
diff --git a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestForwardDeclTest.cs b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestForwardDeclTest.cs
similarity index 98%
rename from test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestForwardDeclTest.cs
rename to test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestForwardDeclTest.cs
index fba6411c..f100a1d7 100644
--- a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestForwardDeclTest.cs
+++ b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestForwardDeclTest.cs
@@ -8,7 +8,7 @@ using ZoneCodeGenerator.Parsing.C_Header;
 using ZoneCodeGenerator.Parsing.C_Header.Tests;
 using ZoneCodeGenerator.Parsing.Testing;
 
-namespace ZoneCodeGeneratorTests.Parsing.Testing.Tests
+namespace ZoneCodeGeneratorTests.Parsing.C_Header.Tests
 {
     [TestClass]
     public class TestForwardDeclTest
diff --git a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestNamespaceTest.cs b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestNamespaceTest.cs
similarity index 98%
rename from test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestNamespaceTest.cs
rename to test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestNamespaceTest.cs
index a8198bcc..165e4bbf 100644
--- a/test/ZoneCodeGeneratorTests/Parsing/Testing/Tests/TestNamespaceTest.cs
+++ b/test/ZoneCodeGeneratorTests/Parsing/C_Header/Tests/TestNamespaceTest.cs
@@ -8,7 +8,7 @@ using ZoneCodeGenerator.Parsing.C_Header.Blocks;
 using ZoneCodeGenerator.Parsing.C_Header.Tests;
 using ZoneCodeGenerator.Parsing.Testing;
 
-namespace ZoneCodeGeneratorTests.Parsing.Testing.Tests
+namespace ZoneCodeGeneratorTests.Parsing.C_Header.Tests
 {
     [TestClass]
     public class TestNamespaceTest