Relocate timer to a more logical package