diff --git a/parm/parm_wave/bull_awips_gfswave b/parm/wave/bull_awips_gfswave
similarity index 100%
rename from parm/parm_wave/bull_awips_gfswave
rename to parm/wave/bull_awips_gfswave
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f000 b/parm/wave/grib2_gfswave.ao_9km.f000
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f000
rename to parm/wave/grib2_gfswave.ao_9km.f000
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f003 b/parm/wave/grib2_gfswave.ao_9km.f003
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f003
rename to parm/wave/grib2_gfswave.ao_9km.f003
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f006 b/parm/wave/grib2_gfswave.ao_9km.f006
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f006
rename to parm/wave/grib2_gfswave.ao_9km.f006
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f009 b/parm/wave/grib2_gfswave.ao_9km.f009
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f009
rename to parm/wave/grib2_gfswave.ao_9km.f009
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f012 b/parm/wave/grib2_gfswave.ao_9km.f012
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f012
rename to parm/wave/grib2_gfswave.ao_9km.f012
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f015 b/parm/wave/grib2_gfswave.ao_9km.f015
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f015
rename to parm/wave/grib2_gfswave.ao_9km.f015
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f018 b/parm/wave/grib2_gfswave.ao_9km.f018
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f018
rename to parm/wave/grib2_gfswave.ao_9km.f018
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f021 b/parm/wave/grib2_gfswave.ao_9km.f021
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f021
rename to parm/wave/grib2_gfswave.ao_9km.f021
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f024 b/parm/wave/grib2_gfswave.ao_9km.f024
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f024
rename to parm/wave/grib2_gfswave.ao_9km.f024
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f027 b/parm/wave/grib2_gfswave.ao_9km.f027
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f027
rename to parm/wave/grib2_gfswave.ao_9km.f027
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f030 b/parm/wave/grib2_gfswave.ao_9km.f030
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f030
rename to parm/wave/grib2_gfswave.ao_9km.f030
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f033 b/parm/wave/grib2_gfswave.ao_9km.f033
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f033
rename to parm/wave/grib2_gfswave.ao_9km.f033
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f036 b/parm/wave/grib2_gfswave.ao_9km.f036
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f036
rename to parm/wave/grib2_gfswave.ao_9km.f036
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f039 b/parm/wave/grib2_gfswave.ao_9km.f039
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f039
rename to parm/wave/grib2_gfswave.ao_9km.f039
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f042 b/parm/wave/grib2_gfswave.ao_9km.f042
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f042
rename to parm/wave/grib2_gfswave.ao_9km.f042
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f045 b/parm/wave/grib2_gfswave.ao_9km.f045
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f045
rename to parm/wave/grib2_gfswave.ao_9km.f045
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f048 b/parm/wave/grib2_gfswave.ao_9km.f048
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f048
rename to parm/wave/grib2_gfswave.ao_9km.f048
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f051 b/parm/wave/grib2_gfswave.ao_9km.f051
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f051
rename to parm/wave/grib2_gfswave.ao_9km.f051
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f054 b/parm/wave/grib2_gfswave.ao_9km.f054
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f054
rename to parm/wave/grib2_gfswave.ao_9km.f054
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f057 b/parm/wave/grib2_gfswave.ao_9km.f057
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f057
rename to parm/wave/grib2_gfswave.ao_9km.f057
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f060 b/parm/wave/grib2_gfswave.ao_9km.f060
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f060
rename to parm/wave/grib2_gfswave.ao_9km.f060
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f063 b/parm/wave/grib2_gfswave.ao_9km.f063
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f063
rename to parm/wave/grib2_gfswave.ao_9km.f063
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f066 b/parm/wave/grib2_gfswave.ao_9km.f066
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f066
rename to parm/wave/grib2_gfswave.ao_9km.f066
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f069 b/parm/wave/grib2_gfswave.ao_9km.f069
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f069
rename to parm/wave/grib2_gfswave.ao_9km.f069
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f072 b/parm/wave/grib2_gfswave.ao_9km.f072
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f072
rename to parm/wave/grib2_gfswave.ao_9km.f072
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f078 b/parm/wave/grib2_gfswave.ao_9km.f078
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f078
rename to parm/wave/grib2_gfswave.ao_9km.f078
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f084 b/parm/wave/grib2_gfswave.ao_9km.f084
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f084
rename to parm/wave/grib2_gfswave.ao_9km.f084
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f090 b/parm/wave/grib2_gfswave.ao_9km.f090
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f090
rename to parm/wave/grib2_gfswave.ao_9km.f090
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f096 b/parm/wave/grib2_gfswave.ao_9km.f096
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f096
rename to parm/wave/grib2_gfswave.ao_9km.f096
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f102 b/parm/wave/grib2_gfswave.ao_9km.f102
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f102
rename to parm/wave/grib2_gfswave.ao_9km.f102
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f108 b/parm/wave/grib2_gfswave.ao_9km.f108
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f108
rename to parm/wave/grib2_gfswave.ao_9km.f108
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f114 b/parm/wave/grib2_gfswave.ao_9km.f114
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f114
rename to parm/wave/grib2_gfswave.ao_9km.f114
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f120 b/parm/wave/grib2_gfswave.ao_9km.f120
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f120
rename to parm/wave/grib2_gfswave.ao_9km.f120
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f126 b/parm/wave/grib2_gfswave.ao_9km.f126
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f126
rename to parm/wave/grib2_gfswave.ao_9km.f126
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f132 b/parm/wave/grib2_gfswave.ao_9km.f132
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f132
rename to parm/wave/grib2_gfswave.ao_9km.f132
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f138 b/parm/wave/grib2_gfswave.ao_9km.f138
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f138
rename to parm/wave/grib2_gfswave.ao_9km.f138
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f144 b/parm/wave/grib2_gfswave.ao_9km.f144
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f144
rename to parm/wave/grib2_gfswave.ao_9km.f144
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f150 b/parm/wave/grib2_gfswave.ao_9km.f150
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f150
rename to parm/wave/grib2_gfswave.ao_9km.f150
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f156 b/parm/wave/grib2_gfswave.ao_9km.f156
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f156
rename to parm/wave/grib2_gfswave.ao_9km.f156
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f162 b/parm/wave/grib2_gfswave.ao_9km.f162
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f162
rename to parm/wave/grib2_gfswave.ao_9km.f162
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f168 b/parm/wave/grib2_gfswave.ao_9km.f168
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f168
rename to parm/wave/grib2_gfswave.ao_9km.f168
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f174 b/parm/wave/grib2_gfswave.ao_9km.f174
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f174
rename to parm/wave/grib2_gfswave.ao_9km.f174
diff --git a/parm/parm_wave/grib2_gfswave.ao_9km.f180 b/parm/wave/grib2_gfswave.ao_9km.f180
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ao_9km.f180
rename to parm/wave/grib2_gfswave.ao_9km.f180
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f000 b/parm/wave/grib2_gfswave.at_10m.f000
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f000
rename to parm/wave/grib2_gfswave.at_10m.f000
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f003 b/parm/wave/grib2_gfswave.at_10m.f003
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f003
rename to parm/wave/grib2_gfswave.at_10m.f003
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f006 b/parm/wave/grib2_gfswave.at_10m.f006
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f006
rename to parm/wave/grib2_gfswave.at_10m.f006
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f009 b/parm/wave/grib2_gfswave.at_10m.f009
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f009
rename to parm/wave/grib2_gfswave.at_10m.f009
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f012 b/parm/wave/grib2_gfswave.at_10m.f012
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f012
rename to parm/wave/grib2_gfswave.at_10m.f012
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f015 b/parm/wave/grib2_gfswave.at_10m.f015
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f015
rename to parm/wave/grib2_gfswave.at_10m.f015
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f018 b/parm/wave/grib2_gfswave.at_10m.f018
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f018
rename to parm/wave/grib2_gfswave.at_10m.f018
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f021 b/parm/wave/grib2_gfswave.at_10m.f021
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f021
rename to parm/wave/grib2_gfswave.at_10m.f021
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f024 b/parm/wave/grib2_gfswave.at_10m.f024
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f024
rename to parm/wave/grib2_gfswave.at_10m.f024
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f027 b/parm/wave/grib2_gfswave.at_10m.f027
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f027
rename to parm/wave/grib2_gfswave.at_10m.f027
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f030 b/parm/wave/grib2_gfswave.at_10m.f030
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f030
rename to parm/wave/grib2_gfswave.at_10m.f030
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f033 b/parm/wave/grib2_gfswave.at_10m.f033
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f033
rename to parm/wave/grib2_gfswave.at_10m.f033
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f036 b/parm/wave/grib2_gfswave.at_10m.f036
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f036
rename to parm/wave/grib2_gfswave.at_10m.f036
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f039 b/parm/wave/grib2_gfswave.at_10m.f039
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f039
rename to parm/wave/grib2_gfswave.at_10m.f039
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f042 b/parm/wave/grib2_gfswave.at_10m.f042
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f042
rename to parm/wave/grib2_gfswave.at_10m.f042
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f045 b/parm/wave/grib2_gfswave.at_10m.f045
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f045
rename to parm/wave/grib2_gfswave.at_10m.f045
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f048 b/parm/wave/grib2_gfswave.at_10m.f048
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f048
rename to parm/wave/grib2_gfswave.at_10m.f048
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f051 b/parm/wave/grib2_gfswave.at_10m.f051
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f051
rename to parm/wave/grib2_gfswave.at_10m.f051
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f054 b/parm/wave/grib2_gfswave.at_10m.f054
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f054
rename to parm/wave/grib2_gfswave.at_10m.f054
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f057 b/parm/wave/grib2_gfswave.at_10m.f057
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f057
rename to parm/wave/grib2_gfswave.at_10m.f057
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f060 b/parm/wave/grib2_gfswave.at_10m.f060
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f060
rename to parm/wave/grib2_gfswave.at_10m.f060
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f063 b/parm/wave/grib2_gfswave.at_10m.f063
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f063
rename to parm/wave/grib2_gfswave.at_10m.f063
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f066 b/parm/wave/grib2_gfswave.at_10m.f066
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f066
rename to parm/wave/grib2_gfswave.at_10m.f066
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f069 b/parm/wave/grib2_gfswave.at_10m.f069
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f069
rename to parm/wave/grib2_gfswave.at_10m.f069
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f072 b/parm/wave/grib2_gfswave.at_10m.f072
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f072
rename to parm/wave/grib2_gfswave.at_10m.f072
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f078 b/parm/wave/grib2_gfswave.at_10m.f078
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f078
rename to parm/wave/grib2_gfswave.at_10m.f078
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f084 b/parm/wave/grib2_gfswave.at_10m.f084
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f084
rename to parm/wave/grib2_gfswave.at_10m.f084
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f090 b/parm/wave/grib2_gfswave.at_10m.f090
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f090
rename to parm/wave/grib2_gfswave.at_10m.f090
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f096 b/parm/wave/grib2_gfswave.at_10m.f096
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f096
rename to parm/wave/grib2_gfswave.at_10m.f096
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f102 b/parm/wave/grib2_gfswave.at_10m.f102
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f102
rename to parm/wave/grib2_gfswave.at_10m.f102
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f108 b/parm/wave/grib2_gfswave.at_10m.f108
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f108
rename to parm/wave/grib2_gfswave.at_10m.f108
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f114 b/parm/wave/grib2_gfswave.at_10m.f114
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f114
rename to parm/wave/grib2_gfswave.at_10m.f114
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f120 b/parm/wave/grib2_gfswave.at_10m.f120
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f120
rename to parm/wave/grib2_gfswave.at_10m.f120
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f126 b/parm/wave/grib2_gfswave.at_10m.f126
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f126
rename to parm/wave/grib2_gfswave.at_10m.f126
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f132 b/parm/wave/grib2_gfswave.at_10m.f132
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f132
rename to parm/wave/grib2_gfswave.at_10m.f132
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f138 b/parm/wave/grib2_gfswave.at_10m.f138
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f138
rename to parm/wave/grib2_gfswave.at_10m.f138
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f144 b/parm/wave/grib2_gfswave.at_10m.f144
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f144
rename to parm/wave/grib2_gfswave.at_10m.f144
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f150 b/parm/wave/grib2_gfswave.at_10m.f150
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f150
rename to parm/wave/grib2_gfswave.at_10m.f150
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f156 b/parm/wave/grib2_gfswave.at_10m.f156
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f156
rename to parm/wave/grib2_gfswave.at_10m.f156
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f162 b/parm/wave/grib2_gfswave.at_10m.f162
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f162
rename to parm/wave/grib2_gfswave.at_10m.f162
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f168 b/parm/wave/grib2_gfswave.at_10m.f168
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f168
rename to parm/wave/grib2_gfswave.at_10m.f168
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f174 b/parm/wave/grib2_gfswave.at_10m.f174
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f174
rename to parm/wave/grib2_gfswave.at_10m.f174
diff --git a/parm/parm_wave/grib2_gfswave.at_10m.f180 b/parm/wave/grib2_gfswave.at_10m.f180
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.at_10m.f180
rename to parm/wave/grib2_gfswave.at_10m.f180
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f000 b/parm/wave/grib2_gfswave.ep_10m.f000
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f000
rename to parm/wave/grib2_gfswave.ep_10m.f000
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f003 b/parm/wave/grib2_gfswave.ep_10m.f003
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f003
rename to parm/wave/grib2_gfswave.ep_10m.f003
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f006 b/parm/wave/grib2_gfswave.ep_10m.f006
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f006
rename to parm/wave/grib2_gfswave.ep_10m.f006
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f009 b/parm/wave/grib2_gfswave.ep_10m.f009
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f009
rename to parm/wave/grib2_gfswave.ep_10m.f009
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f012 b/parm/wave/grib2_gfswave.ep_10m.f012
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f012
rename to parm/wave/grib2_gfswave.ep_10m.f012
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f015 b/parm/wave/grib2_gfswave.ep_10m.f015
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f015
rename to parm/wave/grib2_gfswave.ep_10m.f015
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f018 b/parm/wave/grib2_gfswave.ep_10m.f018
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f018
rename to parm/wave/grib2_gfswave.ep_10m.f018
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f021 b/parm/wave/grib2_gfswave.ep_10m.f021
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f021
rename to parm/wave/grib2_gfswave.ep_10m.f021
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f024 b/parm/wave/grib2_gfswave.ep_10m.f024
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f024
rename to parm/wave/grib2_gfswave.ep_10m.f024
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f027 b/parm/wave/grib2_gfswave.ep_10m.f027
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f027
rename to parm/wave/grib2_gfswave.ep_10m.f027
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f030 b/parm/wave/grib2_gfswave.ep_10m.f030
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f030
rename to parm/wave/grib2_gfswave.ep_10m.f030
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f033 b/parm/wave/grib2_gfswave.ep_10m.f033
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f033
rename to parm/wave/grib2_gfswave.ep_10m.f033
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f036 b/parm/wave/grib2_gfswave.ep_10m.f036
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f036
rename to parm/wave/grib2_gfswave.ep_10m.f036
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f039 b/parm/wave/grib2_gfswave.ep_10m.f039
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f039
rename to parm/wave/grib2_gfswave.ep_10m.f039
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f042 b/parm/wave/grib2_gfswave.ep_10m.f042
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f042
rename to parm/wave/grib2_gfswave.ep_10m.f042
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f045 b/parm/wave/grib2_gfswave.ep_10m.f045
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f045
rename to parm/wave/grib2_gfswave.ep_10m.f045
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f048 b/parm/wave/grib2_gfswave.ep_10m.f048
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f048
rename to parm/wave/grib2_gfswave.ep_10m.f048
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f051 b/parm/wave/grib2_gfswave.ep_10m.f051
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f051
rename to parm/wave/grib2_gfswave.ep_10m.f051
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f054 b/parm/wave/grib2_gfswave.ep_10m.f054
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f054
rename to parm/wave/grib2_gfswave.ep_10m.f054
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f057 b/parm/wave/grib2_gfswave.ep_10m.f057
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f057
rename to parm/wave/grib2_gfswave.ep_10m.f057
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f060 b/parm/wave/grib2_gfswave.ep_10m.f060
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f060
rename to parm/wave/grib2_gfswave.ep_10m.f060
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f063 b/parm/wave/grib2_gfswave.ep_10m.f063
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f063
rename to parm/wave/grib2_gfswave.ep_10m.f063
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f066 b/parm/wave/grib2_gfswave.ep_10m.f066
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f066
rename to parm/wave/grib2_gfswave.ep_10m.f066
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f069 b/parm/wave/grib2_gfswave.ep_10m.f069
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f069
rename to parm/wave/grib2_gfswave.ep_10m.f069
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f072 b/parm/wave/grib2_gfswave.ep_10m.f072
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f072
rename to parm/wave/grib2_gfswave.ep_10m.f072
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f078 b/parm/wave/grib2_gfswave.ep_10m.f078
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f078
rename to parm/wave/grib2_gfswave.ep_10m.f078
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f084 b/parm/wave/grib2_gfswave.ep_10m.f084
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f084
rename to parm/wave/grib2_gfswave.ep_10m.f084
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f090 b/parm/wave/grib2_gfswave.ep_10m.f090
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f090
rename to parm/wave/grib2_gfswave.ep_10m.f090
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f096 b/parm/wave/grib2_gfswave.ep_10m.f096
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f096
rename to parm/wave/grib2_gfswave.ep_10m.f096
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f102 b/parm/wave/grib2_gfswave.ep_10m.f102
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f102
rename to parm/wave/grib2_gfswave.ep_10m.f102
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f108 b/parm/wave/grib2_gfswave.ep_10m.f108
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f108
rename to parm/wave/grib2_gfswave.ep_10m.f108
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f114 b/parm/wave/grib2_gfswave.ep_10m.f114
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f114
rename to parm/wave/grib2_gfswave.ep_10m.f114
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f120 b/parm/wave/grib2_gfswave.ep_10m.f120
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f120
rename to parm/wave/grib2_gfswave.ep_10m.f120
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f126 b/parm/wave/grib2_gfswave.ep_10m.f126
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f126
rename to parm/wave/grib2_gfswave.ep_10m.f126
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f132 b/parm/wave/grib2_gfswave.ep_10m.f132
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f132
rename to parm/wave/grib2_gfswave.ep_10m.f132
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f138 b/parm/wave/grib2_gfswave.ep_10m.f138
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f138
rename to parm/wave/grib2_gfswave.ep_10m.f138
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f144 b/parm/wave/grib2_gfswave.ep_10m.f144
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f144
rename to parm/wave/grib2_gfswave.ep_10m.f144
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f150 b/parm/wave/grib2_gfswave.ep_10m.f150
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f150
rename to parm/wave/grib2_gfswave.ep_10m.f150
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f156 b/parm/wave/grib2_gfswave.ep_10m.f156
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f156
rename to parm/wave/grib2_gfswave.ep_10m.f156
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f162 b/parm/wave/grib2_gfswave.ep_10m.f162
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f162
rename to parm/wave/grib2_gfswave.ep_10m.f162
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f168 b/parm/wave/grib2_gfswave.ep_10m.f168
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f168
rename to parm/wave/grib2_gfswave.ep_10m.f168
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f174 b/parm/wave/grib2_gfswave.ep_10m.f174
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f174
rename to parm/wave/grib2_gfswave.ep_10m.f174
diff --git a/parm/parm_wave/grib2_gfswave.ep_10m.f180 b/parm/wave/grib2_gfswave.ep_10m.f180
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.ep_10m.f180
rename to parm/wave/grib2_gfswave.ep_10m.f180
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f000 b/parm/wave/grib2_gfswave.glo_30m.f000
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f000
rename to parm/wave/grib2_gfswave.glo_30m.f000
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f003 b/parm/wave/grib2_gfswave.glo_30m.f003
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f003
rename to parm/wave/grib2_gfswave.glo_30m.f003
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f006 b/parm/wave/grib2_gfswave.glo_30m.f006
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f006
rename to parm/wave/grib2_gfswave.glo_30m.f006
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f009 b/parm/wave/grib2_gfswave.glo_30m.f009
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f009
rename to parm/wave/grib2_gfswave.glo_30m.f009
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f012 b/parm/wave/grib2_gfswave.glo_30m.f012
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f012
rename to parm/wave/grib2_gfswave.glo_30m.f012
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f015 b/parm/wave/grib2_gfswave.glo_30m.f015
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f015
rename to parm/wave/grib2_gfswave.glo_30m.f015
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f018 b/parm/wave/grib2_gfswave.glo_30m.f018
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f018
rename to parm/wave/grib2_gfswave.glo_30m.f018
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f021 b/parm/wave/grib2_gfswave.glo_30m.f021
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f021
rename to parm/wave/grib2_gfswave.glo_30m.f021
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f024 b/parm/wave/grib2_gfswave.glo_30m.f024
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f024
rename to parm/wave/grib2_gfswave.glo_30m.f024
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f027 b/parm/wave/grib2_gfswave.glo_30m.f027
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f027
rename to parm/wave/grib2_gfswave.glo_30m.f027
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f030 b/parm/wave/grib2_gfswave.glo_30m.f030
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f030
rename to parm/wave/grib2_gfswave.glo_30m.f030
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f033 b/parm/wave/grib2_gfswave.glo_30m.f033
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f033
rename to parm/wave/grib2_gfswave.glo_30m.f033
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f036 b/parm/wave/grib2_gfswave.glo_30m.f036
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f036
rename to parm/wave/grib2_gfswave.glo_30m.f036
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f039 b/parm/wave/grib2_gfswave.glo_30m.f039
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f039
rename to parm/wave/grib2_gfswave.glo_30m.f039
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f042 b/parm/wave/grib2_gfswave.glo_30m.f042
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f042
rename to parm/wave/grib2_gfswave.glo_30m.f042
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f045 b/parm/wave/grib2_gfswave.glo_30m.f045
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f045
rename to parm/wave/grib2_gfswave.glo_30m.f045
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f048 b/parm/wave/grib2_gfswave.glo_30m.f048
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f048
rename to parm/wave/grib2_gfswave.glo_30m.f048
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f051 b/parm/wave/grib2_gfswave.glo_30m.f051
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f051
rename to parm/wave/grib2_gfswave.glo_30m.f051
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f054 b/parm/wave/grib2_gfswave.glo_30m.f054
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f054
rename to parm/wave/grib2_gfswave.glo_30m.f054
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f057 b/parm/wave/grib2_gfswave.glo_30m.f057
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f057
rename to parm/wave/grib2_gfswave.glo_30m.f057
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f060 b/parm/wave/grib2_gfswave.glo_30m.f060
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f060
rename to parm/wave/grib2_gfswave.glo_30m.f060
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f063 b/parm/wave/grib2_gfswave.glo_30m.f063
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f063
rename to parm/wave/grib2_gfswave.glo_30m.f063
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f066 b/parm/wave/grib2_gfswave.glo_30m.f066
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f066
rename to parm/wave/grib2_gfswave.glo_30m.f066
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f069 b/parm/wave/grib2_gfswave.glo_30m.f069
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f069
rename to parm/wave/grib2_gfswave.glo_30m.f069
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f072 b/parm/wave/grib2_gfswave.glo_30m.f072
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f072
rename to parm/wave/grib2_gfswave.glo_30m.f072
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f078 b/parm/wave/grib2_gfswave.glo_30m.f078
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f078
rename to parm/wave/grib2_gfswave.glo_30m.f078
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f084 b/parm/wave/grib2_gfswave.glo_30m.f084
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f084
rename to parm/wave/grib2_gfswave.glo_30m.f084
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f090 b/parm/wave/grib2_gfswave.glo_30m.f090
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f090
rename to parm/wave/grib2_gfswave.glo_30m.f090
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f096 b/parm/wave/grib2_gfswave.glo_30m.f096
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f096
rename to parm/wave/grib2_gfswave.glo_30m.f096
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f102 b/parm/wave/grib2_gfswave.glo_30m.f102
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f102
rename to parm/wave/grib2_gfswave.glo_30m.f102
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f108 b/parm/wave/grib2_gfswave.glo_30m.f108
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f108
rename to parm/wave/grib2_gfswave.glo_30m.f108
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f114 b/parm/wave/grib2_gfswave.glo_30m.f114
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f114
rename to parm/wave/grib2_gfswave.glo_30m.f114
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f120 b/parm/wave/grib2_gfswave.glo_30m.f120
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f120
rename to parm/wave/grib2_gfswave.glo_30m.f120
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f126 b/parm/wave/grib2_gfswave.glo_30m.f126
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f126
rename to parm/wave/grib2_gfswave.glo_30m.f126
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f132 b/parm/wave/grib2_gfswave.glo_30m.f132
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f132
rename to parm/wave/grib2_gfswave.glo_30m.f132
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f138 b/parm/wave/grib2_gfswave.glo_30m.f138
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f138
rename to parm/wave/grib2_gfswave.glo_30m.f138
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f144 b/parm/wave/grib2_gfswave.glo_30m.f144
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f144
rename to parm/wave/grib2_gfswave.glo_30m.f144
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f150 b/parm/wave/grib2_gfswave.glo_30m.f150
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f150
rename to parm/wave/grib2_gfswave.glo_30m.f150
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f156 b/parm/wave/grib2_gfswave.glo_30m.f156
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f156
rename to parm/wave/grib2_gfswave.glo_30m.f156
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f162 b/parm/wave/grib2_gfswave.glo_30m.f162
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f162
rename to parm/wave/grib2_gfswave.glo_30m.f162
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f168 b/parm/wave/grib2_gfswave.glo_30m.f168
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f168
rename to parm/wave/grib2_gfswave.glo_30m.f168
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f174 b/parm/wave/grib2_gfswave.glo_30m.f174
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f174
rename to parm/wave/grib2_gfswave.glo_30m.f174
diff --git a/parm/parm_wave/grib2_gfswave.glo_30m.f180 b/parm/wave/grib2_gfswave.glo_30m.f180
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.glo_30m.f180
rename to parm/wave/grib2_gfswave.glo_30m.f180
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f000 b/parm/wave/grib2_gfswave.wc_10m.f000
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f000
rename to parm/wave/grib2_gfswave.wc_10m.f000
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f003 b/parm/wave/grib2_gfswave.wc_10m.f003
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f003
rename to parm/wave/grib2_gfswave.wc_10m.f003
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f006 b/parm/wave/grib2_gfswave.wc_10m.f006
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f006
rename to parm/wave/grib2_gfswave.wc_10m.f006
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f009 b/parm/wave/grib2_gfswave.wc_10m.f009
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f009
rename to parm/wave/grib2_gfswave.wc_10m.f009
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f012 b/parm/wave/grib2_gfswave.wc_10m.f012
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f012
rename to parm/wave/grib2_gfswave.wc_10m.f012
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f015 b/parm/wave/grib2_gfswave.wc_10m.f015
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f015
rename to parm/wave/grib2_gfswave.wc_10m.f015
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f018 b/parm/wave/grib2_gfswave.wc_10m.f018
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f018
rename to parm/wave/grib2_gfswave.wc_10m.f018
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f021 b/parm/wave/grib2_gfswave.wc_10m.f021
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f021
rename to parm/wave/grib2_gfswave.wc_10m.f021
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f024 b/parm/wave/grib2_gfswave.wc_10m.f024
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f024
rename to parm/wave/grib2_gfswave.wc_10m.f024
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f027 b/parm/wave/grib2_gfswave.wc_10m.f027
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f027
rename to parm/wave/grib2_gfswave.wc_10m.f027
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f030 b/parm/wave/grib2_gfswave.wc_10m.f030
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f030
rename to parm/wave/grib2_gfswave.wc_10m.f030
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f033 b/parm/wave/grib2_gfswave.wc_10m.f033
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f033
rename to parm/wave/grib2_gfswave.wc_10m.f033
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f036 b/parm/wave/grib2_gfswave.wc_10m.f036
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f036
rename to parm/wave/grib2_gfswave.wc_10m.f036
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f039 b/parm/wave/grib2_gfswave.wc_10m.f039
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f039
rename to parm/wave/grib2_gfswave.wc_10m.f039
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f042 b/parm/wave/grib2_gfswave.wc_10m.f042
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f042
rename to parm/wave/grib2_gfswave.wc_10m.f042
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f045 b/parm/wave/grib2_gfswave.wc_10m.f045
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f045
rename to parm/wave/grib2_gfswave.wc_10m.f045
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f048 b/parm/wave/grib2_gfswave.wc_10m.f048
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f048
rename to parm/wave/grib2_gfswave.wc_10m.f048
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f051 b/parm/wave/grib2_gfswave.wc_10m.f051
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f051
rename to parm/wave/grib2_gfswave.wc_10m.f051
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f054 b/parm/wave/grib2_gfswave.wc_10m.f054
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f054
rename to parm/wave/grib2_gfswave.wc_10m.f054
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f057 b/parm/wave/grib2_gfswave.wc_10m.f057
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f057
rename to parm/wave/grib2_gfswave.wc_10m.f057
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f060 b/parm/wave/grib2_gfswave.wc_10m.f060
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f060
rename to parm/wave/grib2_gfswave.wc_10m.f060
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f063 b/parm/wave/grib2_gfswave.wc_10m.f063
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f063
rename to parm/wave/grib2_gfswave.wc_10m.f063
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f066 b/parm/wave/grib2_gfswave.wc_10m.f066
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f066
rename to parm/wave/grib2_gfswave.wc_10m.f066
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f069 b/parm/wave/grib2_gfswave.wc_10m.f069
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f069
rename to parm/wave/grib2_gfswave.wc_10m.f069
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f072 b/parm/wave/grib2_gfswave.wc_10m.f072
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f072
rename to parm/wave/grib2_gfswave.wc_10m.f072
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f078 b/parm/wave/grib2_gfswave.wc_10m.f078
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f078
rename to parm/wave/grib2_gfswave.wc_10m.f078
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f084 b/parm/wave/grib2_gfswave.wc_10m.f084
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f084
rename to parm/wave/grib2_gfswave.wc_10m.f084
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f090 b/parm/wave/grib2_gfswave.wc_10m.f090
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f090
rename to parm/wave/grib2_gfswave.wc_10m.f090
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f096 b/parm/wave/grib2_gfswave.wc_10m.f096
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f096
rename to parm/wave/grib2_gfswave.wc_10m.f096
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f102 b/parm/wave/grib2_gfswave.wc_10m.f102
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f102
rename to parm/wave/grib2_gfswave.wc_10m.f102
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f108 b/parm/wave/grib2_gfswave.wc_10m.f108
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f108
rename to parm/wave/grib2_gfswave.wc_10m.f108
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f114 b/parm/wave/grib2_gfswave.wc_10m.f114
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f114
rename to parm/wave/grib2_gfswave.wc_10m.f114
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f120 b/parm/wave/grib2_gfswave.wc_10m.f120
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f120
rename to parm/wave/grib2_gfswave.wc_10m.f120
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f126 b/parm/wave/grib2_gfswave.wc_10m.f126
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f126
rename to parm/wave/grib2_gfswave.wc_10m.f126
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f132 b/parm/wave/grib2_gfswave.wc_10m.f132
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f132
rename to parm/wave/grib2_gfswave.wc_10m.f132
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f138 b/parm/wave/grib2_gfswave.wc_10m.f138
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f138
rename to parm/wave/grib2_gfswave.wc_10m.f138
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f144 b/parm/wave/grib2_gfswave.wc_10m.f144
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f144
rename to parm/wave/grib2_gfswave.wc_10m.f144
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f150 b/parm/wave/grib2_gfswave.wc_10m.f150
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f150
rename to parm/wave/grib2_gfswave.wc_10m.f150
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f156 b/parm/wave/grib2_gfswave.wc_10m.f156
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f156
rename to parm/wave/grib2_gfswave.wc_10m.f156
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f162 b/parm/wave/grib2_gfswave.wc_10m.f162
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f162
rename to parm/wave/grib2_gfswave.wc_10m.f162
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f168 b/parm/wave/grib2_gfswave.wc_10m.f168
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f168
rename to parm/wave/grib2_gfswave.wc_10m.f168
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f174 b/parm/wave/grib2_gfswave.wc_10m.f174
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f174
rename to parm/wave/grib2_gfswave.wc_10m.f174
diff --git a/parm/parm_wave/grib2_gfswave.wc_10m.f180 b/parm/wave/grib2_gfswave.wc_10m.f180
similarity index 100%
rename from parm/parm_wave/grib2_gfswave.wc_10m.f180
rename to parm/wave/grib2_gfswave.wc_10m.f180