Moved stuff from default package into TimeManager package