Restructure: separate trackers and clients