Refactored clock to be own module