Updated files to work with OpenCV 3.0
Removed old file locations