Library code and public headers are now properly separated, we can fix include paths to remove the redundant subfolder.