diff --git a/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/Object/ControlledRandom.cs b/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/ControlledRandom.cs
similarity index 100%
rename from Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/Object/ControlledRandom.cs
rename to Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/ControlledRandom.cs
diff --git a/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/IGenerator.cs b/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/IGenerator.cs
deleted file mode 100644
index 8face2fa5..000000000
--- a/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/IGenerator.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace PChecker.Generator;
-
-public interface IGenerator<T>
-{
-    /// <summary>
-    /// Mutate the current generator and create a new one.
-    /// </summary>
-    /// <returns>A new generator.</returns>
-    T Mutate();
-
-    T New();
-}
\ No newline at end of file
diff --git a/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/IInputGenerator.cs b/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/IInputGenerator.cs
deleted file mode 100644
index a8ce3b097..000000000
--- a/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/IInputGenerator.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace PChecker.Generator;
-
-public interface IInputGenerator<T> : IGenerator<T>
-{
-
-    /// <summary>
-    /// Returns a non-negative random number.
-    /// </summary>
-    int Next();
-
-    /// <summary>
-    /// Returns a non-negative random number less than maxValue.
-    /// </summary>
-    /// <param name="maxValue">Exclusive upper bound</param>
-    int Next(int maxValue);
-
-    /// <summary>
-    /// Returns a random floating-point number that is greater
-    /// than or equal to 0.0, and less than 1.0.
-    /// </summary>
-    double NextDouble();
-}
\ No newline at end of file
diff --git a/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/IScheduleGenerator.cs b/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/IScheduleGenerator.cs
deleted file mode 100644
index 4850f55ef..000000000
--- a/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/IScheduleGenerator.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using PChecker.SystematicTesting.Operations;
-
-namespace PChecker.Generator;
-
-internal interface IScheduleGenerator<T>: IGenerator<T>
-{
-    /// <summary>
-    /// Get the next scheduled operation.
-    /// </summary>
-    /// <param name="enabledOperations">All enabled operations.</param>
-    /// <param name="current">Current operation.</param>
-    /// <returns>Next enabled operation.</returns>
-    public AsyncOperation? NextRandomOperation(List<AsyncOperation> enabledOperations, AsyncOperation current);
-
-
-    public void PrepareForNextInput();
-}
\ No newline at end of file
diff --git a/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/Object/RandomChoices.cs b/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/RandomChoices.cs
similarity index 100%
rename from Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/Object/RandomChoices.cs
rename to Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/RandomChoices.cs
diff --git a/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/Mutator/Utils.cs b/Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/Utils.cs
similarity index 100%
rename from Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/Mutator/Utils.cs
rename to Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/Generator/Utils.cs