Rename Timeline class, remove obsolete class