diff --git a/RLLib_training/RailEnvRLLibWrapper.py b/RLLib_training/RailEnvRLLibWrapper.py
index 989800044250d60b68c68b5d2e702b5625964024..eb9bbd6b4fb72321d0b745922799e227abd4184e 100644
--- a/RLLib_training/RailEnvRLLibWrapper.py
+++ b/RLLib_training/RailEnvRLLibWrapper.py
@@ -2,8 +2,8 @@ import numpy as np
 from ray.rllib.env.multi_agent_env import MultiAgentEnv
 from ray.rllib.utils.seed import seed as set_seed
 
-from flatland.envs.generators import complex_rail_generator, random_rail_generator
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator, random_rail_generator
 
 
 class RailEnvRLLibWrapper(MultiAgentEnv):
diff --git a/scoring/utils/misc_utils.py b/scoring/utils/misc_utils.py
index 924f216b1a7ea2a540037231b837eb9de49db6ac..e6f9195dcbf4adf242e18adbe02c150ba46cd3f5 100644
--- a/scoring/utils/misc_utils.py
+++ b/scoring/utils/misc_utils.py
@@ -3,11 +3,11 @@ import time
 
 import numpy as np
 
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator, rail_from_file
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator, rail_from_file
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from flatland.utils.rendertools import RenderTool
 
 # Time factor to test the max time allowed for an env.
diff --git a/sequential_agent/run_test.py b/sequential_agent/run_test.py
index ee4e9ed076864145e64f62a8742d2e0dfc513dec..31b21e896aa99993a53aea6be4e27e3493ca8105 100644
--- a/sequential_agent/run_test.py
+++ b/sequential_agent/run_test.py
@@ -1,10 +1,10 @@
 import numpy as np
 
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from flatland.utils.rendertools import RenderTool
 from sequential_agent.simple_order_agent import OrderedAgent
 
diff --git a/torch_training/multi_agent_inference.py b/torch_training/multi_agent_inference.py
index 96f791d1c83751ba9c05b336f097abed3305595f..6e62687ec23043765ae5e90af1895e1b3e153b49 100644
--- a/torch_training/multi_agent_inference.py
+++ b/torch_training/multi_agent_inference.py
@@ -8,8 +8,8 @@ from observation_builders.observations import TreeObsForRailEnv
 from predictors.predictions import ShortestPathPredictorForRailEnv
 
 import torch_training.Nets
-from flatland.envs.generators import rail_from_file
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import rail_from_file
 from flatland.utils.rendertools import RenderTool
 from torch_training.dueling_double_dqn import Agent
 from utils.observation_utils import normalize_observation
diff --git a/torch_training/multi_agent_training.py b/torch_training/multi_agent_training.py
index ef0cae712a4deb557933d6ffb019f1124f2aceb1..1e545ecc4fbf0e3af30414b7a84ac53912122b76 100644
--- a/torch_training/multi_agent_training.py
+++ b/torch_training/multi_agent_training.py
@@ -11,12 +11,12 @@ from importlib_resources import path
 
 # Import Torch and utility functions to normalize observation
 import torch_training.Nets
-# Import Flatland/ Observations and Predictors
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+# Import Flatland/ Observations and Predictors
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from torch_training.dueling_double_dqn import Agent
 from utils.observation_utils import normalize_observation
 
diff --git a/torch_training/multi_agent_two_time_step_training.py b/torch_training/multi_agent_two_time_step_training.py
index f41495d49681b73b103fd8cceb3b1217b05ffff2..d0aafa3b6ec148f80a1ee8357407371d0a69dbd9 100644
--- a/torch_training/multi_agent_two_time_step_training.py
+++ b/torch_training/multi_agent_two_time_step_training.py
@@ -11,12 +11,12 @@ from importlib_resources import path
 
 # Import Torch and utility functions to normalize observation
 import torch_training.Nets
-# Import Flatland/ Observations and Predictors
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+# Import Flatland/ Observations and Predictors
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from torch_training.dueling_double_dqn import Agent
 from utils.observation_utils import norm_obs_clip, split_tree
 
diff --git a/torch_training/render_agent_behavior.py b/torch_training/render_agent_behavior.py
index 38bd009111db0f13357e1fdd8c6cdb3ef0432441..3b48d6f5429f70fcd212846c05359261c4971e50 100644
--- a/torch_training/render_agent_behavior.py
+++ b/torch_training/render_agent_behavior.py
@@ -6,11 +6,11 @@ import torch
 from importlib_resources import path
 
 import torch_training.Nets
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from flatland.utils.rendertools import RenderTool
 from torch_training.dueling_double_dqn import Agent
 from utils.observation_utils import norm_obs_clip, split_tree
diff --git a/torch_training/training_navigation.py b/torch_training/training_navigation.py
index 40e5a68b1e78506c16783783537b4383fadc823a..623beb5b77083df36411bf26d18538267d50fe22 100644
--- a/torch_training/training_navigation.py
+++ b/torch_training/training_navigation.py
@@ -8,10 +8,10 @@ import numpy as np
 import torch
 from dueling_double_dqn import Agent
 
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from flatland.utils.rendertools import RenderTool
 from utils.observation_utils import norm_obs_clip, split_tree
 
diff --git a/utils/misc_utils.py b/utils/misc_utils.py
index 6e23af202b61e924f6ecbec44089440e7bdf4e9e..19c704bc19f302b1e6a74ef93b1715e154dff544 100644
--- a/utils/misc_utils.py
+++ b/utils/misc_utils.py
@@ -5,10 +5,10 @@ from collections import deque
 import numpy as np
 from line_profiler import LineProfiler
 
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import GlobalObsForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from utils.observation_utils import norm_obs_clip, split_tree