Bug 897088 - [Clock] Modules incorrectly organized r=ianliu