diff --git a/tests/ForeverFactory.Tests/BehaviorsSelection/NotFillPropertiesBehaviorTests.cs b/tests/ForeverFactory.Tests/BehaviorsSelection/NotFillPropertiesBehaviorTests.cs
index 367695f..3a78d8d 100644
--- a/tests/ForeverFactory.Tests/BehaviorsSelection/NotFillPropertiesBehaviorTests.cs
+++ b/tests/ForeverFactory.Tests/BehaviorsSelection/NotFillPropertiesBehaviorTests.cs
@@ -2,7 +2,7 @@
 using FluentAssertions;
 using ForeverFactory.Behaviors;
 using ForeverFactory.Builders;
-using ForeverFactory.Tests.CustomizedFactories.ExampleFactories;
+using ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories;
 using Xunit;
 
 namespace ForeverFactory.Tests.BehaviorsSelection
diff --git a/tests/ForeverFactory.Tests/Core/GeneratorNodeTests.cs b/tests/ForeverFactory.Tests/Core/GeneratorNodeTests.cs
index d86c1d8..d671688 100644
--- a/tests/ForeverFactory.Tests/Core/GeneratorNodeTests.cs
+++ b/tests/ForeverFactory.Tests/Core/GeneratorNodeTests.cs
@@ -4,7 +4,7 @@
 using ForeverFactory.Core.Transforms;
 using ForeverFactory.Core.Transforms.Guards;
 using ForeverFactory.Core.Transforms.Guards.Specifications;
-using ForeverFactory.Tests.CustomizedFactories.ExampleFactories;
+using ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories;
 using Xunit;
 
 namespace ForeverFactory.Tests.Core
diff --git a/tests/ForeverFactory.Tests/Core/ObjectFactoryTests.cs b/tests/ForeverFactory.Tests/Core/ObjectFactoryTests.cs
index 559dd53..f0a01a3 100644
--- a/tests/ForeverFactory.Tests/Core/ObjectFactoryTests.cs
+++ b/tests/ForeverFactory.Tests/Core/ObjectFactoryTests.cs
@@ -1,7 +1,7 @@
 using FluentAssertions;
 using ForeverFactory.Core;
 using ForeverFactory.Core.Transforms;
-using ForeverFactory.Tests.CustomizedFactories.ExampleFactories;
+using ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories;
 using Xunit;
 
 namespace ForeverFactory.Tests.Core
diff --git a/tests/ForeverFactory.Tests/Core/Transforms/FuncTransformTests.cs b/tests/ForeverFactory.Tests/Core/Transforms/FuncTransformTests.cs
index 57a53c2..095d23f 100644
--- a/tests/ForeverFactory.Tests/Core/Transforms/FuncTransformTests.cs
+++ b/tests/ForeverFactory.Tests/Core/Transforms/FuncTransformTests.cs
@@ -1,6 +1,6 @@
 using FluentAssertions;
 using ForeverFactory.Core.Transforms;
-using ForeverFactory.Tests.CustomizedFactories.ExampleFactories;
+using ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories;
 using Xunit;
 
 namespace ForeverFactory.Tests.Core.Transforms
diff --git a/tests/ForeverFactory.Tests/Core/Transforms/ReflectedTransformTests.cs b/tests/ForeverFactory.Tests/Core/Transforms/ReflectedTransformTests.cs
index 6889cce..cf3a2b0 100644
--- a/tests/ForeverFactory.Tests/Core/Transforms/ReflectedTransformTests.cs
+++ b/tests/ForeverFactory.Tests/Core/Transforms/ReflectedTransformTests.cs
@@ -1,6 +1,6 @@
 using FluentAssertions;
 using ForeverFactory.Core.Transforms;
-using ForeverFactory.Tests.CustomizedFactories.ExampleFactories;
+using ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories;
 using Xunit;
 
 namespace ForeverFactory.Tests.Core.Transforms
diff --git a/tests/ForeverFactory.Tests/MagicFactoryTests.cs b/tests/ForeverFactory.Tests/Factories/BasicActionsTests.cs
similarity index 91%
rename from tests/ForeverFactory.Tests/MagicFactoryTests.cs
rename to tests/ForeverFactory.Tests/Factories/BasicActionsTests.cs
index 295ce87..1872ece 100644
--- a/tests/ForeverFactory.Tests/MagicFactoryTests.cs
+++ b/tests/ForeverFactory.Tests/Factories/BasicActionsTests.cs
@@ -1,12 +1,8 @@
-using System.Collections.Generic;
-using FluentAssertions;
-using FluentAssertions.Extensions;
-using ForeverFactory.Builders;
-using ForeverFactory.Core.Transforms;
-using ForeverFactory.Tests.CustomizedFactories.ExampleFactories;
+using FluentAssertions;
+using ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories;
 using Xunit;
 
-namespace ForeverFactory.Tests
+namespace ForeverFactory.Tests.Factories
 {
     public class MagicFactoryTests
     {
diff --git a/tests/ForeverFactory.Tests/CustomizedFactories/CustomizedFactoryTests.cs b/tests/ForeverFactory.Tests/Factories/CustomizedFactories/CustomizedFactoryTests.cs
similarity index 89%
rename from tests/ForeverFactory.Tests/CustomizedFactories/CustomizedFactoryTests.cs
rename to tests/ForeverFactory.Tests/Factories/CustomizedFactories/CustomizedFactoryTests.cs
index ff05aa5..0838d45 100644
--- a/tests/ForeverFactory.Tests/CustomizedFactories/CustomizedFactoryTests.cs
+++ b/tests/ForeverFactory.Tests/Factories/CustomizedFactories/CustomizedFactoryTests.cs
@@ -1,9 +1,8 @@
 using FluentAssertions;
-using ForeverFactory.Behaviors;
-using ForeverFactory.Tests.CustomizedFactories.ExampleFactories;
+using ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories;
 using Xunit;
 
-namespace ForeverFactory.Tests.CustomizedFactories
+namespace ForeverFactory.Tests.Factories.CustomizedFactories
 {
     public class CustomizedFactoryTests
     {
diff --git a/tests/ForeverFactory.Tests/CustomizedFactories/ExampleFactories/PersonFactory.cs b/tests/ForeverFactory.Tests/Factories/CustomizedFactories/ExampleFactories/PersonFactory.cs
similarity index 86%
rename from tests/ForeverFactory.Tests/CustomizedFactories/ExampleFactories/PersonFactory.cs
rename to tests/ForeverFactory.Tests/Factories/CustomizedFactories/ExampleFactories/PersonFactory.cs
index cbaee37..8b04010 100644
--- a/tests/ForeverFactory.Tests/CustomizedFactories/ExampleFactories/PersonFactory.cs
+++ b/tests/ForeverFactory.Tests/Factories/CustomizedFactories/ExampleFactories/PersonFactory.cs
@@ -1,4 +1,4 @@
-namespace ForeverFactory.Tests.CustomizedFactories.ExampleFactories
+namespace ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories
 {
     public class PersonFactory : MagicFactory<Person>
     {
diff --git a/tests/ForeverFactory.Tests/CustomizedFactories/ExampleFactories/ProductFactory.cs b/tests/ForeverFactory.Tests/Factories/CustomizedFactories/ExampleFactories/ProductFactory.cs
similarity index 88%
rename from tests/ForeverFactory.Tests/CustomizedFactories/ExampleFactories/ProductFactory.cs
rename to tests/ForeverFactory.Tests/Factories/CustomizedFactories/ExampleFactories/ProductFactory.cs
index 54d2021..1f0105b 100644
--- a/tests/ForeverFactory.Tests/CustomizedFactories/ExampleFactories/ProductFactory.cs
+++ b/tests/ForeverFactory.Tests/Factories/CustomizedFactories/ExampleFactories/ProductFactory.cs
@@ -1,4 +1,4 @@
-namespace ForeverFactory.Tests.CustomizedFactories.ExampleFactories
+namespace ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories
 {
     public class ProductFactory : MagicFactory<Product>
     {
diff --git a/tests/ForeverFactory.Tests/MultipleInstanceBuildingTests.cs b/tests/ForeverFactory.Tests/Factories/MultipleInstanceBuildingTests.cs
similarity index 97%
rename from tests/ForeverFactory.Tests/MultipleInstanceBuildingTests.cs
rename to tests/ForeverFactory.Tests/Factories/MultipleInstanceBuildingTests.cs
index c972b8b..0cb832c 100644
--- a/tests/ForeverFactory.Tests/MultipleInstanceBuildingTests.cs
+++ b/tests/ForeverFactory.Tests/Factories/MultipleInstanceBuildingTests.cs
@@ -1,11 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
-using ForeverFactory.Tests.CustomizedFactories.ExampleFactories;
+using ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories;
 using Xunit;
 
-namespace ForeverFactory.Tests
+namespace ForeverFactory.Tests.Factories
 {
     public class MultipleInstanceBuildingTests
     {
diff --git a/tests/ForeverFactory.Tests/NavigationBetweenInterfacesTests.cs b/tests/ForeverFactory.Tests/Factories/NavigationBetweenInterfacesTests.cs
similarity index 95%
rename from tests/ForeverFactory.Tests/NavigationBetweenInterfacesTests.cs
rename to tests/ForeverFactory.Tests/Factories/NavigationBetweenInterfacesTests.cs
index 15d81d2..88e2a54 100644
--- a/tests/ForeverFactory.Tests/NavigationBetweenInterfacesTests.cs
+++ b/tests/ForeverFactory.Tests/Factories/NavigationBetweenInterfacesTests.cs
@@ -2,10 +2,10 @@
 using System.Linq;
 using FluentAssertions;
 using ForeverFactory.Builders;
-using ForeverFactory.Tests.CustomizedFactories.ExampleFactories;
+using ForeverFactory.Tests.Factories.CustomizedFactories.ExampleFactories;
 using Xunit;
 
-namespace ForeverFactory.Tests
+namespace ForeverFactory.Tests.Factories
 {
     public class NavigationBetweenInterfacesTests
     {