moved all tracking code into tracking sub folder