More refactoring.

Still a lot to do, but Clock module working as intended now.
Still more cleanup coming, Temperature will become a real module and more...