Cleaning + preparation for OVR lib
Lib for OVR