Cleanup of Schema files

Fixed some schemas that were not in the right directory