Shift headers to include top-level CUsrLib/ folder. Changed CMakeLists files to reflect the same