Move Tracker to dedicated file