cleanup of schema files. Renamed for consistency and removed unused