MOTECH-1001 | Update to use scheduler classes from new packages.

Change-Id: Icf18ab06a51ee19544466103af0447f2a574ad98