Improve module structure and make TimeMachine work again.