diff --git a/src/FluentSQL.Tests/Compilation/QueryCompilerTests.cs b/src/FluentSQL.Tests/Compilation/QueryCompilerTests.cs
deleted file mode 100644
index 1dc705d..0000000
--- a/src/FluentSQL.Tests/Compilation/QueryCompilerTests.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using FluentAssertions;
-
-using FluentSQL.Compilation;
-using FluentSQL.Databases;
-using FluentSQL.Querying;
-using FluentSQL.Querying.Extensions;
-using FluentSQL.Querying.Statements.Extensions;
-using FluentSQL.Tests.Compilation.Builders;
-using FluentSQL.Tests.Databases.Builders;
-using FluentSQL.Tests.Examples;
-
-using Xunit;
-
-namespace FluentSQL.Tests.Compilation
-{
-    public class QueryCompilerTests
-    {
-        public class When_compiling_a_query : Specification<QueryCompiler>
-        {
-            protected override QueryCompiler EstablishContext()
-            {
-                QueryCompiler compiler = new QueryCompilerBuilder().Build();
-
-                Database database = new DatabaseBuilder().Using(compiler).Build();
-
-                var model = new ExampleModel(database);
-                QueryComponent = model.Query<string>()
-                    .From(() => model.Customers)
-                    .Select(() => model.Customers.Name);
-
-                return compiler;
-            }
-
-            protected override void Because(QueryCompiler sut)
-            {
-                Query = QueryComponent.Compile();
-            }
-
-            [Fact]
-            public void It_should_create_the_query()
-            {
-                Query.Should().NotBeNull();
-            }
-
-            private Query<string> Query { get; set; }
-            private QueryComponent<NoParameters, string> QueryComponent { get; set; }
-        }
-    }
-}
diff --git a/src/FluentSQL.Tests/Querying/QueryComponentTests.cs b/src/FluentSQL.Tests/Querying/QueryComponentTests.cs
new file mode 100644
index 0000000..289896d
--- /dev/null
+++ b/src/FluentSQL.Tests/Querying/QueryComponentTests.cs
@@ -0,0 +1,45 @@
+using FluentAssertions;
+
+using FluentSQL.Databases;
+using FluentSQL.Querying;
+using FluentSQL.Querying.Extensions;
+using FluentSQL.Querying.Statements.Extensions;
+using FluentSQL.Tests.Databases.Builders;
+using FluentSQL.Tests.Examples;
+
+using Xunit;
+
+namespace FluentSQL.Tests.Querying
+{
+    public class QueryComponentTests
+    {
+        public class When_compiling_a_query : Specification<QueryComponent<NoParameters, string>>
+        {
+            protected override QueryComponent<NoParameters, string> EstablishContext()
+            {
+                Database database = new DatabaseBuilder().Build();
+
+                var model = new ExampleModel(database);
+                QueryComponent<NoParameters, string> queryComponent =
+                    model.Query<string>()
+                        .From(() => model.Customers)
+                        .Select(() => model.Customers.Name);
+
+                return queryComponent;
+            }
+
+            protected override void Because(QueryComponent<NoParameters, string> sut)
+            {
+                Query = sut.Compile();
+            }
+
+            [Fact]
+            public void It_should_create_the_query()
+            {
+                Query.Should().NotBeNull();
+            }
+
+            private Query<string> Query { get; set; }
+        }
+    }
+}