Reordered classes in tracking.py