Removed TrackerManager and reorganized code into separate classes