Rearranged the TimelineEntityManager in two separate components.