Reorganize the schema files