Corrections to schemas, placed them in their own folder