Clean, add interface methods

Added objects to scheduler, added methods to use them
Cleaned up redundant includes, moved them to header files.