Updated scheduler and threads to use new classes