A bunch of changes
Moved "ClockController" from time module to hime modules