Moved CornerTrackingHacking
Tidied things up, moved things around
Removed old files