diff --git a/Data/cf-standard-names/11/src/CFStandardNameTable-1.1.xsd b/Data/cf-standard-names/11/src/CFStandardNameTable-1.1.xsd
deleted file mode 100755
index 6931aa9fe..000000000
--- a/Data/cf-standard-names/11/src/CFStandardNameTable-1.1.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
- The alias element contains an entry_id element with the id of the entry containing the definition. It is intended as a mechanism for modifying standard names in a backward compatible fashion.
-
-
-
-
-
-
-
-
-
-
- AMIP identifier
-
-
-
-
- Standard SI units for this variable. In a netCDF file, the variable should have units that are translatable to the canonical units.
-
-
-
-
- The person or institution that is responsible for maintaining the standard name table.
-
-
-
-
- A textual description of the variable.
-
-
-
-
- An entry element contains the description, units, and correspondence to other standard name schemes, for one variable.
-
-
-
-
-
-
-
-
-
-
-
-
-
- See alias.
-
-
-
-
- GRIB parameter code. ECMWF codes start with 'E', NCEP codes with 'N'. Standard FM92 codes are not prefaced.
-
-
-
-
- Institution that maintains the standard name table.
-
-
-
-
- Version number of the standard name table.
-
-
-
-
- Last modified datetime.
-
-
-
-
- Top level element of the table.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/cf-standard-names/2/src/CFStandardNameTable-1.0.xsd b/Data/cf-standard-names/2/src/CFStandardNameTable-1.0.xsd
deleted file mode 100755
index 447bac6af..000000000
--- a/Data/cf-standard-names/2/src/CFStandardNameTable-1.0.xsd
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
- The alias element contains an entry_id element with the id of the entry containing the definition. It is intended as a mechanism for modifying standard names in a backward compatible fashion.
-
-
-
-
-
-
-
-
-
-
- AMIP identifier
-
-
-
-
- Standard SI units for this variable. In a netCDF file, the variable should have units that are translatable to the canonical units.
-
-
-
-
- The person or institution that is responsible for maintaining the standard name table.
-
-
-
-
- A textual description of the variable.
-
-
-
-
- An entry element contains the description, units, and correspondence to other standard name schemes, for one variable.
-
-
-
-
-
-
-
-
-
-
-
-
-
- See alias.
-
-
-
-
- GRIB parameter code. ECMWF codes start with 'E', NCEP codes with 'N'. Standard FM92 codes are not prefaced.
-
-
-
-
- Institution that maintains the standard name table.
-
-
-
-
- Top level element of the table.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/cf-standard-names/2/src/CFStandardNameTable-1.1.xsd b/Data/cf-standard-names/2/src/CFStandardNameTable-1.1.xsd
deleted file mode 100755
index 6931aa9fe..000000000
--- a/Data/cf-standard-names/2/src/CFStandardNameTable-1.1.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
- The alias element contains an entry_id element with the id of the entry containing the definition. It is intended as a mechanism for modifying standard names in a backward compatible fashion.
-
-
-
-
-
-
-
-
-
-
- AMIP identifier
-
-
-
-
- Standard SI units for this variable. In a netCDF file, the variable should have units that are translatable to the canonical units.
-
-
-
-
- The person or institution that is responsible for maintaining the standard name table.
-
-
-
-
- A textual description of the variable.
-
-
-
-
- An entry element contains the description, units, and correspondence to other standard name schemes, for one variable.
-
-
-
-
-
-
-
-
-
-
-
-
-
- See alias.
-
-
-
-
- GRIB parameter code. ECMWF codes start with 'E', NCEP codes with 'N'. Standard FM92 codes are not prefaced.
-
-
-
-
- Institution that maintains the standard name table.
-
-
-
-
- Version number of the standard name table.
-
-
-
-
- Last modified datetime.
-
-
-
-
- Top level element of the table.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/cf-standard-names/3/src/CFStandardNameTable-1.0.xsd b/Data/cf-standard-names/3/src/CFStandardNameTable-1.0.xsd
deleted file mode 100755
index 447bac6af..000000000
--- a/Data/cf-standard-names/3/src/CFStandardNameTable-1.0.xsd
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
- The alias element contains an entry_id element with the id of the entry containing the definition. It is intended as a mechanism for modifying standard names in a backward compatible fashion.
-
-
-
-
-
-
-
-
-
-
- AMIP identifier
-
-
-
-
- Standard SI units for this variable. In a netCDF file, the variable should have units that are translatable to the canonical units.
-
-
-
-
- The person or institution that is responsible for maintaining the standard name table.
-
-
-
-
- A textual description of the variable.
-
-
-
-
- An entry element contains the description, units, and correspondence to other standard name schemes, for one variable.
-
-
-
-
-
-
-
-
-
-
-
-
-
- See alias.
-
-
-
-
- GRIB parameter code. ECMWF codes start with 'E', NCEP codes with 'N'. Standard FM92 codes are not prefaced.
-
-
-
-
- Institution that maintains the standard name table.
-
-
-
-
- Top level element of the table.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/cf-standard-names/3/src/CFStandardNameTable-1.1.xsd b/Data/cf-standard-names/3/src/CFStandardNameTable-1.1.xsd
deleted file mode 100755
index 6931aa9fe..000000000
--- a/Data/cf-standard-names/3/src/CFStandardNameTable-1.1.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
- The alias element contains an entry_id element with the id of the entry containing the definition. It is intended as a mechanism for modifying standard names in a backward compatible fashion.
-
-
-
-
-
-
-
-
-
-
- AMIP identifier
-
-
-
-
- Standard SI units for this variable. In a netCDF file, the variable should have units that are translatable to the canonical units.
-
-
-
-
- The person or institution that is responsible for maintaining the standard name table.
-
-
-
-
- A textual description of the variable.
-
-
-
-
- An entry element contains the description, units, and correspondence to other standard name schemes, for one variable.
-
-
-
-
-
-
-
-
-
-
-
-
-
- See alias.
-
-
-
-
- GRIB parameter code. ECMWF codes start with 'E', NCEP codes with 'N'. Standard FM92 codes are not prefaced.
-
-
-
-
- Institution that maintains the standard name table.
-
-
-
-
- Version number of the standard name table.
-
-
-
-
- Last modified datetime.
-
-
-
-
- Top level element of the table.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/cf-standard-names/5/src/CFStandardNameTable-1.0.xsd b/Data/cf-standard-names/5/src/CFStandardNameTable-1.0.xsd
deleted file mode 100755
index 447bac6af..000000000
--- a/Data/cf-standard-names/5/src/CFStandardNameTable-1.0.xsd
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
- The alias element contains an entry_id element with the id of the entry containing the definition. It is intended as a mechanism for modifying standard names in a backward compatible fashion.
-
-
-
-
-
-
-
-
-
-
- AMIP identifier
-
-
-
-
- Standard SI units for this variable. In a netCDF file, the variable should have units that are translatable to the canonical units.
-
-
-
-
- The person or institution that is responsible for maintaining the standard name table.
-
-
-
-
- A textual description of the variable.
-
-
-
-
- An entry element contains the description, units, and correspondence to other standard name schemes, for one variable.
-
-
-
-
-
-
-
-
-
-
-
-
-
- See alias.
-
-
-
-
- GRIB parameter code. ECMWF codes start with 'E', NCEP codes with 'N'. Standard FM92 codes are not prefaced.
-
-
-
-
- Institution that maintains the standard name table.
-
-
-
-
- Top level element of the table.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/cf-standard-names/5/src/CFStandardNameTable-1.1.xsd b/Data/cf-standard-names/5/src/CFStandardNameTable-1.1.xsd
deleted file mode 100755
index 6931aa9fe..000000000
--- a/Data/cf-standard-names/5/src/CFStandardNameTable-1.1.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
- The alias element contains an entry_id element with the id of the entry containing the definition. It is intended as a mechanism for modifying standard names in a backward compatible fashion.
-
-
-
-
-
-
-
-
-
-
- AMIP identifier
-
-
-
-
- Standard SI units for this variable. In a netCDF file, the variable should have units that are translatable to the canonical units.
-
-
-
-
- The person or institution that is responsible for maintaining the standard name table.
-
-
-
-
- A textual description of the variable.
-
-
-
-
- An entry element contains the description, units, and correspondence to other standard name schemes, for one variable.
-
-
-
-
-
-
-
-
-
-
-
-
-
- See alias.
-
-
-
-
- GRIB parameter code. ECMWF codes start with 'E', NCEP codes with 'N'. Standard FM92 codes are not prefaced.
-
-
-
-
- Institution that maintains the standard name table.
-
-
-
-
- Version number of the standard name table.
-
-
-
-
- Last modified datetime.
-
-
-
-
- Top level element of the table.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/cf-standard-names/7/src/CFStandardNameTable-1.1.xsd b/Data/cf-standard-names/7/src/CFStandardNameTable-1.1.xsd
deleted file mode 100755
index 6931aa9fe..000000000
--- a/Data/cf-standard-names/7/src/CFStandardNameTable-1.1.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
- The alias element contains an entry_id element with the id of the entry containing the definition. It is intended as a mechanism for modifying standard names in a backward compatible fashion.
-
-
-
-
-
-
-
-
-
-
- AMIP identifier
-
-
-
-
- Standard SI units for this variable. In a netCDF file, the variable should have units that are translatable to the canonical units.
-
-
-
-
- The person or institution that is responsible for maintaining the standard name table.
-
-
-
-
- A textual description of the variable.
-
-
-
-
- An entry element contains the description, units, and correspondence to other standard name schemes, for one variable.
-
-
-
-
-
-
-
-
-
-
-
-
-
- See alias.
-
-
-
-
- GRIB parameter code. ECMWF codes start with 'E', NCEP codes with 'N'. Standard FM92 codes are not prefaced.
-
-
-
-
- Institution that maintains the standard name table.
-
-
-
-
- Version number of the standard name table.
-
-
-
-
- Last modified datetime.
-
-
-
-
- Top level element of the table.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/cf-standard-names/8/src/CFStandardNameTable-1.1.xsd b/Data/cf-standard-names/8/src/CFStandardNameTable-1.1.xsd
deleted file mode 100755
index 6931aa9fe..000000000
--- a/Data/cf-standard-names/8/src/CFStandardNameTable-1.1.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
- The alias element contains an entry_id element with the id of the entry containing the definition. It is intended as a mechanism for modifying standard names in a backward compatible fashion.
-
-
-
-
-
-
-
-
-
-
- AMIP identifier
-
-
-
-
- Standard SI units for this variable. In a netCDF file, the variable should have units that are translatable to the canonical units.
-
-
-
-
- The person or institution that is responsible for maintaining the standard name table.
-
-
-
-
- A textual description of the variable.
-
-
-
-
- An entry element contains the description, units, and correspondence to other standard name schemes, for one variable.
-
-
-
-
-
-
-
-
-
-
-
-
-
- See alias.
-
-
-
-
- GRIB parameter code. ECMWF codes start with 'E', NCEP codes with 'N'. Standard FM92 codes are not prefaced.
-
-
-
-
- Institution that maintains the standard name table.
-
-
-
-
- Version number of the standard name table.
-
-
-
-
- Last modified datetime.
-
-
-
-
- Top level element of the table.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/cf-standard-names/1/src/CFStandardNameTable-1.0.xsd b/Data/cf-standard-names/schema-files/CFStandardNameTable-1.0.xsd
similarity index 100%
rename from Data/cf-standard-names/1/src/CFStandardNameTable-1.0.xsd
rename to Data/cf-standard-names/schema-files/CFStandardNameTable-1.0.xsd
diff --git a/Data/cf-standard-names/10/src/CFStandardNameTable-1.1.xsd b/Data/cf-standard-names/schema-files/CFStandardNameTable-1.1.xsd
similarity index 100%
rename from Data/cf-standard-names/10/src/CFStandardNameTable-1.1.xsd
rename to Data/cf-standard-names/schema-files/CFStandardNameTable-1.1.xsd
diff --git a/Data/cf-standard-names/13/src/area-type-table.xsd b/Data/cf-standard-names/schema-files/area-type-table.xsd
similarity index 100%
rename from Data/cf-standard-names/13/src/area-type-table.xsd
rename to Data/cf-standard-names/schema-files/area-type-table.xsd
diff --git a/Data/cf-standard-names/13/src/cf-standard-name-table-1.1.xsd b/Data/cf-standard-names/schema-files/cf-standard-name-table-1.1.xsd
similarity index 100%
rename from Data/cf-standard-names/13/src/cf-standard-name-table-1.1.xsd
rename to Data/cf-standard-names/schema-files/cf-standard-name-table-1.1.xsd