Revert "Thing about separating scheduling functionality"
Revert "Thing about separating scheduling functionality"

This reverts commit 9b35a71f7d1cfdf0b68c31395fb295cbaad628af.

andreyleskov/GridDomain,linkelf/GridDomain