Move pre-v3 resources to top level