diff --git a/Debug.LightweightIocContainer.FactoryGenerator/SampleInstaller.cs b/Debug.LightweightIocContainer.FactoryGenerator/SampleInstaller.cs
index 3f63134..dd14b13 100644
--- a/Debug.LightweightIocContainer.FactoryGenerator/SampleInstaller.cs
+++ b/Debug.LightweightIocContainer.FactoryGenerator/SampleInstaller.cs
@@ -2,6 +2,9 @@
 // Created: 2025-12-01
 // Copyright(c) 2025 SimonG. All Rights Reserved.
 
+using Debug.LightweightIocContainer.FactoryGenerator.Samples;
+using Debug.LightweightIocContainer.FactoryGenerator.Samples.Factories;
+using Debug.LightweightIocContainer.FactoryGenerator.Samples.Interfaces;
 using LightweightIocContainer.FactoryGenerator;
 using LightweightIocContainer.Interfaces.Installers;
 using LightweightIocContainer.Interfaces.Registrations;
diff --git a/Debug.LightweightIocContainer.FactoryGenerator/SampleClass.cs b/Debug.LightweightIocContainer.FactoryGenerator/Samples/Factories/ISampleClassFactory.cs
similarity index 65%
rename from Debug.LightweightIocContainer.FactoryGenerator/SampleClass.cs
rename to Debug.LightweightIocContainer.FactoryGenerator/Samples/Factories/ISampleClassFactory.cs
index 3575aff..37356a4 100644
--- a/Debug.LightweightIocContainer.FactoryGenerator/SampleClass.cs
+++ b/Debug.LightweightIocContainer.FactoryGenerator/Samples/Factories/ISampleClassFactory.cs
@@ -1,11 +1,6 @@
-// Author: Simon.Gockner
-// Created: 2025-12-01
-// Copyright(c) 2025 SimonG. All Rights Reserved.
+using Debug.LightweightIocContainer.FactoryGenerator.Samples.Interfaces;
 
-namespace Debug.LightweightIocContainer.FactoryGenerator;
-
-public class SampleClass : ISampleClass;
-public interface ISampleClass;
+namespace Debug.LightweightIocContainer.FactoryGenerator.Samples.Factories;
 
 public interface ISampleClassFactory
 {
diff --git a/Debug.LightweightIocContainer.FactoryGenerator/Samples/Interfaces/ISampleClass.cs b/Debug.LightweightIocContainer.FactoryGenerator/Samples/Interfaces/ISampleClass.cs
new file mode 100644
index 0000000..c9c7c62
--- /dev/null
+++ b/Debug.LightweightIocContainer.FactoryGenerator/Samples/Interfaces/ISampleClass.cs
@@ -0,0 +1,3 @@
+namespace Debug.LightweightIocContainer.FactoryGenerator.Samples.Interfaces;
+
+public interface ISampleClass;
\ No newline at end of file
diff --git a/Debug.LightweightIocContainer.FactoryGenerator/Samples/SampleClass.cs b/Debug.LightweightIocContainer.FactoryGenerator/Samples/SampleClass.cs
new file mode 100644
index 0000000..c2b1429
--- /dev/null
+++ b/Debug.LightweightIocContainer.FactoryGenerator/Samples/SampleClass.cs
@@ -0,0 +1,9 @@
+// Author: Simon.Gockner
+// Created: 2025-12-01
+// Copyright(c) 2025 SimonG. All Rights Reserved.
+
+using Debug.LightweightIocContainer.FactoryGenerator.Samples.Interfaces;
+
+namespace Debug.LightweightIocContainer.FactoryGenerator.Samples;
+
+public class SampleClass : ISampleClass;
\ No newline at end of file