moving towards o3d, refactoring