Merge "Move remaining schema files into v2_1 directory"