more cleanup structure

mostly fleshing out some of the scheduler module