Make namespace/name changes and ensure files are required in correct order.