Moved stuff from default package into TimeManager package (reverted from commit 69bae4ea0d5ec1ad0ea09f699b7a407351c261c4)