Moved ConnectionTracker to a folder