Some cleanup of namespaces and whatnot.
Removed the copy of OpenCV code in the repo