Change directory organization and split StepScheduler to 2 classes