Minor cleanup and organization of schema files.