moved all tracking code to tracking subfolder
updated controller to track faster