restructuring schema folder . re #10273
Merge remote-tracking branch 'origin/feature/10273_reorganise_schema_folder'