Reorganize schema files