Migrated time management to its own module, closer tied to the DCG stuff.
Merge conflicts resolved.