Cleanup and rearrangement of a few things
BaseTrackModule no longer directly interacts with Track instances