diff --git a/javaUtilities/hydro/.project b/javaUtilities/hydro/.project new file mode 100644 index 0000000000..41ad1d7b67 --- /dev/null +++ b/javaUtilities/hydro/.project @@ -0,0 +1,11 @@ + + + hydro + + + + + + + + diff --git a/nativeLib/build.ohd/.project b/javaUtilities/hydro/build.ohd/.project similarity index 100% rename from nativeLib/build.ohd/.project rename to javaUtilities/hydro/build.ohd/.project diff --git a/nativeLib/build.ohd/build-RIVERMONITOR.xml b/javaUtilities/hydro/build.ohd/build-RIVERMONITOR.xml similarity index 100% rename from nativeLib/build.ohd/build-RIVERMONITOR.xml rename to javaUtilities/hydro/build.ohd/build-RIVERMONITOR.xml diff --git a/nativeLib/build.ohd/build-SITESPECIFIC.xml b/javaUtilities/hydro/build.ohd/build-SITESPECIFIC.xml similarity index 100% rename from nativeLib/build.ohd/build-SITESPECIFIC.xml rename to javaUtilities/hydro/build.ohd/build-SITESPECIFIC.xml diff --git a/nativeLib/build.ohd/build-common.xml b/javaUtilities/hydro/build.ohd/build-common.xml similarity index 100% rename from nativeLib/build.ohd/build-common.xml rename to javaUtilities/hydro/build.ohd/build-common.xml diff --git a/nativeLib/build.ohd/build.ohd.ecl b/javaUtilities/hydro/build.ohd/build.ohd.ecl similarity index 100% rename from nativeLib/build.ohd/build.ohd.ecl rename to javaUtilities/hydro/build.ohd/build.ohd.ecl diff --git a/nativeLib/build.ohd/clean-ALL.xml b/javaUtilities/hydro/build.ohd/clean-ALL.xml similarity index 100% rename from nativeLib/build.ohd/clean-ALL.xml rename to javaUtilities/hydro/build.ohd/clean-ALL.xml diff --git a/nativeLib/build.ohd/dependencies.xml b/javaUtilities/hydro/build.ohd/dependencies.xml similarity index 100% rename from nativeLib/build.ohd/dependencies.xml rename to javaUtilities/hydro/build.ohd/dependencies.xml diff --git a/nativeLib/build.ohd/project.list b/javaUtilities/hydro/build.ohd/project.list similarity index 100% rename from nativeLib/build.ohd/project.list rename to javaUtilities/hydro/build.ohd/project.list diff --git a/nativeLib/ohd.bias_trans/.classpath b/javaUtilities/hydro/ohd.bias_trans/.classpath similarity index 100% rename from nativeLib/ohd.bias_trans/.classpath rename to javaUtilities/hydro/ohd.bias_trans/.classpath diff --git a/nativeLib/ohd.bias_trans/.project b/javaUtilities/hydro/ohd.bias_trans/.project similarity index 100% rename from nativeLib/ohd.bias_trans/.project rename to javaUtilities/hydro/ohd.bias_trans/.project diff --git a/nativeLib/ohd.bias_trans/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.bias_trans/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.bias_trans/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.bias_trans/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.bias_trans/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.bias_trans/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.bias_trans/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.bias_trans/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.bias_trans/build.properties b/javaUtilities/hydro/ohd.bias_trans/build.properties similarity index 100% rename from nativeLib/ohd.bias_trans/build.properties rename to javaUtilities/hydro/ohd.bias_trans/build.properties diff --git a/nativeLib/ohd.bias_trans/build.xml b/javaUtilities/hydro/ohd.bias_trans/build.xml similarity index 100% rename from nativeLib/ohd.bias_trans/build.xml rename to javaUtilities/hydro/ohd.bias_trans/build.xml diff --git a/nativeLib/ohd.bias_trans/ohd.bias_trans.ecl b/javaUtilities/hydro/ohd.bias_trans/ohd.bias_trans.ecl similarity index 100% rename from nativeLib/ohd.bias_trans/ohd.bias_trans.ecl rename to javaUtilities/hydro/ohd.bias_trans/ohd.bias_trans.ecl diff --git a/nativeLib/ohd.bias_trans/scripts/process_rfc_bias b/javaUtilities/hydro/ohd.bias_trans/scripts/process_rfc_bias similarity index 100% rename from nativeLib/ohd.bias_trans/scripts/process_rfc_bias rename to javaUtilities/hydro/ohd.bias_trans/scripts/process_rfc_bias diff --git a/nativeLib/ohd.bias_trans/scripts/transmit_rfc_bias b/javaUtilities/hydro/ohd.bias_trans/scripts/transmit_rfc_bias similarity index 100% rename from nativeLib/ohd.bias_trans/scripts/transmit_rfc_bias rename to javaUtilities/hydro/ohd.bias_trans/scripts/transmit_rfc_bias diff --git a/nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDataMgr.java b/javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDataMgr.java similarity index 100% rename from nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDataMgr.java rename to javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDataMgr.java diff --git a/nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDynGroup.java b/javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDynGroup.java similarity index 100% rename from nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDynGroup.java rename to javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDynGroup.java diff --git a/nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDynSet.java b/javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDynSet.java similarity index 100% rename from nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDynSet.java rename to javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasDynSet.java diff --git a/nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasMessageCreator.java b/javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasMessageCreator.java similarity index 100% rename from nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasMessageCreator.java rename to javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasMessageCreator.java diff --git a/nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasMessageReader.java b/javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasMessageReader.java similarity index 100% rename from nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasMessageReader.java rename to javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/BiasMessageReader.java diff --git a/nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/MemorySpanGroup.java b/javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/MemorySpanGroup.java similarity index 100% rename from nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/MemorySpanGroup.java rename to javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/MemorySpanGroup.java diff --git a/nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/RadarBias.java b/javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/RadarBias.java similarity index 100% rename from nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/RadarBias.java rename to javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/RadarBias.java diff --git a/nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/RfcBiasConstants.java b/javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/RfcBiasConstants.java similarity index 100% rename from nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/RfcBiasConstants.java rename to javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/RfcBiasConstants.java diff --git a/nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/RfcBiasMessage.java b/javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/RfcBiasMessage.java similarity index 100% rename from nativeLib/ohd.bias_trans/src/ohd/hseb/bias_trans/RfcBiasMessage.java rename to javaUtilities/hydro/ohd.bias_trans/src/ohd/hseb/bias_trans/RfcBiasMessage.java diff --git a/nativeLib/ohd.common/.classpath b/javaUtilities/hydro/ohd.common/.classpath similarity index 100% rename from nativeLib/ohd.common/.classpath rename to javaUtilities/hydro/ohd.common/.classpath diff --git a/nativeLib/ohd.common/.project b/javaUtilities/hydro/ohd.common/.project similarity index 100% rename from nativeLib/ohd.common/.project rename to javaUtilities/hydro/ohd.common/.project diff --git a/nativeLib/ohd.common/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.common/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.common/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.common/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.common/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.common/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.common/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.common/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.common/build.properties b/javaUtilities/hydro/ohd.common/build.properties similarity index 100% rename from nativeLib/ohd.common/build.properties rename to javaUtilities/hydro/ohd.common/build.properties diff --git a/nativeLib/ohd.common/build.xml b/javaUtilities/hydro/ohd.common/build.xml similarity index 100% rename from nativeLib/ohd.common/build.xml rename to javaUtilities/hydro/ohd.common/build.xml diff --git a/nativeLib/ohd.common/ohd.common.ecl b/javaUtilities/hydro/ohd.common/ohd.common.ecl similarity index 100% rename from nativeLib/ohd.common/ohd.common.ecl rename to javaUtilities/hydro/ohd.common/ohd.common.ecl diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/contour/ContourGrid.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/contour/ContourGrid.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/contour/ContourGrid.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/contour/ContourGrid.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/contour/Interpolator.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/contour/Interpolator.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/contour/Interpolator.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/contour/Interpolator.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/contour/RowColToLatLonTranslator.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/contour/RowColToLatLonTranslator.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/contour/RowColToLatLonTranslator.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/contour/RowColToLatLonTranslator.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/contour/RowToLatLonContourer.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/contour/RowToLatLonContourer.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/contour/RowToLatLonContourer.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/contour/RowToLatLonContourer.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/model/DrawableShape.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/DrawableShape.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/model/DrawableShape.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/DrawableShape.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/model/ElevationMap.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/ElevationMap.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/model/ElevationMap.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/ElevationMap.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/model/HrapRowColToLatLonConverter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/HrapRowColToLatLonConverter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/model/HrapRowColToLatLonConverter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/HrapRowColToLatLonConverter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/model/LatLonBounds.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/LatLonBounds.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/model/LatLonBounds.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/LatLonBounds.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/model/LatLonPoint.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/LatLonPoint.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/model/LatLonPoint.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/LatLonPoint.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/model/LatLonPolyline.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/LatLonPolyline.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/model/LatLonPolyline.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/LatLonPolyline.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/model/Polygon.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/Polygon.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/model/Polygon.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/Polygon.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/model/RowColumnPoint.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/RowColumnPoint.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/model/RowColumnPoint.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/model/RowColumnPoint.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/projection/BaseMapProjection.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/projection/BaseMapProjection.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/projection/BaseMapProjection.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/projection/BaseMapProjection.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/projection/FlatMapProjection.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/projection/FlatMapProjection.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/projection/FlatMapProjection.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/projection/FlatMapProjection.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/projection/MapProjection.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/projection/MapProjection.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/projection/MapProjection.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/projection/MapProjection.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/geomap/projection/PolarProjection.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/projection/PolarProjection.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/geomap/projection/PolarProjection.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/geomap/projection/PolarProjection.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/grid/XmrgGrid.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/grid/XmrgGrid.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/grid/XmrgGrid.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/grid/XmrgGrid.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/AbsTimeMeasurement.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/AbsTimeMeasurement.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/AbsTimeMeasurement.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/AbsTimeMeasurement.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/AbsTimeMeasurementPair.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/AbsTimeMeasurementPair.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/AbsTimeMeasurementPair.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/AbsTimeMeasurementPair.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/IrregularTimeSeries.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/IrregularTimeSeries.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/IrregularTimeSeries.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/IrregularTimeSeries.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/IrregularTimeSeriesHolder.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/IrregularTimeSeriesHolder.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/IrregularTimeSeriesHolder.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/IrregularTimeSeriesHolder.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/Measurement.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/Measurement.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/Measurement.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/Measurement.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/MeasurementHolder.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasurementHolder.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/MeasurementHolder.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasurementHolder.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/MeasurementPoint.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasurementPoint.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/MeasurementPoint.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasurementPoint.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/MeasurementPointComparator.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasurementPointComparator.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/MeasurementPointComparator.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasurementPointComparator.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/MeasurementPointSeries.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasurementPointSeries.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/MeasurementPointSeries.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasurementPointSeries.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/MeasuringUnit.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasuringUnit.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/MeasuringUnit.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasuringUnit.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/MeasuringUnitConversionException.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasuringUnitConversionException.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/MeasuringUnitConversionException.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasuringUnitConversionException.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/MeasuringUnitType.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasuringUnitType.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/MeasuringUnitType.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/MeasuringUnitType.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/RegularTimeSeries.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/RegularTimeSeries.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/RegularTimeSeries.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/RegularTimeSeries.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/RegularTimeSeriesHolder.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/RegularTimeSeriesHolder.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/RegularTimeSeriesHolder.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/RegularTimeSeriesHolder.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/RelTimeMeasurement.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/RelTimeMeasurement.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/RelTimeMeasurement.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/RelTimeMeasurement.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/TimeIntervalMeasurement.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/TimeIntervalMeasurement.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/TimeIntervalMeasurement.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/TimeIntervalMeasurement.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/TimeSeriesEvent.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/TimeSeriesEvent.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/TimeSeriesEvent.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/TimeSeriesEvent.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/TimeSeriesListener.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/TimeSeriesListener.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/TimeSeriesListener.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/TimeSeriesListener.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/measurement/TimeSeriesTotaller.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/TimeSeriesTotaller.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/measurement/TimeSeriesTotaller.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/measurement/TimeSeriesTotaller.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/DurationCode.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/DurationCode.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/DurationCode.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/DurationCode.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/ForecastAdjuster.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastAdjuster.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/ForecastAdjuster.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastAdjuster.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/ForecastAdjusterParams.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastAdjusterParams.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/ForecastAdjusterParams.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastAdjusterParams.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/ForecastAdjustmentTest.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastAdjustmentTest.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/ForecastAdjustmentTest.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastAdjustmentTest.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/ForecastBlender.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastBlender.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/ForecastBlender.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastBlender.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/ForecastInterpolationMethod.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastInterpolationMethod.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/ForecastInterpolationMethod.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ForecastInterpolationMethod.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/LocationDescriptor.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/LocationDescriptor.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/LocationDescriptor.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/LocationDescriptor.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/MonthlyValues.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/MonthlyValues.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/MonthlyValues.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/MonthlyValues.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/ObservedForecastMeasurementPair.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ObservedForecastMeasurementPair.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/ObservedForecastMeasurementPair.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ObservedForecastMeasurementPair.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/ParamCode.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ParamCode.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/ParamCode.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/ParamCode.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/RainfallRunoffModel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RainfallRunoffModel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/RainfallRunoffModel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RainfallRunoffModel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/RainfallRunoffModelType.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RainfallRunoffModelType.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/RainfallRunoffModelType.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RainfallRunoffModelType.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/RainfallToStageModel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RainfallToStageModel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/RainfallToStageModel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RainfallToStageModel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/RatingCurve.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RatingCurve.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/RatingCurve.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RatingCurve.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/RatingPoint.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RatingPoint.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/RatingPoint.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RatingPoint.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/RatingShift.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RatingShift.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/RatingShift.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/RatingShift.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/SigRiverLevels.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/SigRiverLevels.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/SigRiverLevels.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/SigRiverLevels.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/StageToFlowValueMapper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/StageToFlowValueMapper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/StageToFlowValueMapper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/StageToFlowValueMapper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrograph.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrograph.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrograph.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrograph.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrographDescriptor.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrographDescriptor.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrographDescriptor.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrographDescriptor.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrographEntry.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrographEntry.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrographEntry.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrographEntry.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrographHolder.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrographHolder.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrographHolder.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrographHolder.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrographTest.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrographTest.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/UnitHydrographTest.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/UnitHydrographTest.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/mkcapi/KcApiRainfallRunoffModel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/mkcapi/KcApiRainfallRunoffModel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/mkcapi/KcApiRainfallRunoffModel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/mkcapi/KcApiRainfallRunoffModel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/mkcapi/KcApiRainfallToStageModel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/mkcapi/KcApiRainfallToStageModel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/mkcapi/KcApiRainfallToStageModel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/mkcapi/KcApiRainfallToStageModel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacRainfallToStageModel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacRainfallToStageModel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacRainfallToStageModel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacRainfallToStageModel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacSmaParameters.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacSmaParameters.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacSmaParameters.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacSmaParameters.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacSmaRainfallRunoffModel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacSmaRainfallRunoffModel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacSmaRainfallRunoffModel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacSmaRainfallRunoffModel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacSmaState.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacSmaState.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacSmaState.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacSmaState.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacSmaTest.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacSmaTest.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/model/sacsma/SacSmaTest.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/model/sacsma/SacSmaTest.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/AppsDefaults.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/AppsDefaults.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/AppsDefaults.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/AppsDefaults.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/BooleanHolder.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/BooleanHolder.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/BooleanHolder.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/BooleanHolder.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/CodeTimer.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/CodeTimer.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/CodeTimer.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/CodeTimer.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/CodeTracer.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/CodeTracer.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/CodeTracer.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/CodeTracer.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/Cryptor.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/Cryptor.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/Cryptor.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/Cryptor.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/DataPoint.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/DataPoint.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/DataPoint.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/DataPoint.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/DoubleHolder.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/DoubleHolder.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/DoubleHolder.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/DoubleHolder.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/EndianConverter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/EndianConverter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/EndianConverter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/EndianConverter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/EnvHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/EnvHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/EnvHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/EnvHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/FileLogger.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/FileLogger.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/FileLogger.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/FileLogger.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/Grid.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/Grid.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/Grid.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/Grid.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/IntegerHolder.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/IntegerHolder.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/IntegerHolder.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/IntegerHolder.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/Logger.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/Logger.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/Logger.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/Logger.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/LongHolder.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/LongHolder.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/LongHolder.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/LongHolder.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/MathHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/MathHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/MathHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/MathHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/MaxMinData.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/MaxMinData.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/MaxMinData.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/MaxMinData.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/MemoryLogger.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/MemoryLogger.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/MemoryLogger.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/MemoryLogger.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/NameValuePair.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/NameValuePair.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/NameValuePair.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/NameValuePair.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/PrecipUtils.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/PrecipUtils.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/PrecipUtils.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/PrecipUtils.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/Range.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/Range.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/Range.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/Range.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/SessionLogger.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/SessionLogger.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/SessionLogger.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/SessionLogger.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/StreamDrainer.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/StreamDrainer.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/StreamDrainer.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/StreamDrainer.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/StringDataConverter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/StringDataConverter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/StringDataConverter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/StringDataConverter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/StringHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/StringHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/StringHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/StringHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/StringParser.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/StringParser.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/StringParser.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/StringParser.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/TimeHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/TimeHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/TimeHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/TimeHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/TimeHolder.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/TimeHolder.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/TimeHolder.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/TimeHolder.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/TimeSeriesFileManager.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/TimeSeriesFileManager.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/TimeSeriesFileManager.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/TimeSeriesFileManager.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/TimerHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/TimerHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/TimerHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/TimerHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/UnitValueMapper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/UnitValueMapper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/UnitValueMapper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/UnitValueMapper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/ValueMapper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/ValueMapper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/ValueMapper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/ValueMapper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/ComponentHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/ComponentHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/ComponentHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/ComponentHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/DatePanel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DatePanel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/DatePanel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DatePanel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTextField.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTextField.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTextField.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTextField.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTimeDialog.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTimeDialog.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTimeDialog.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTimeDialog.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTimeEvent.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTimeEvent.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTimeEvent.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTimeEvent.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTimeEventListener.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTimeEventListener.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTimeEventListener.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTimeEventListener.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTimeTextField.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTimeTextField.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/DateTimeTextField.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DateTimeTextField.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/DialogHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DialogHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/DialogHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/DialogHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/ExtensionFileFilter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/ExtensionFileFilter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/ExtensionFileFilter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/ExtensionFileFilter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/FontHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/FontHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/FontHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/FontHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/FrameCloseWindowListener.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/FrameCloseWindowListener.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/FrameCloseWindowListener.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/FrameCloseWindowListener.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/ItemsSelectionDialog.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/ItemsSelectionDialog.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/ItemsSelectionDialog.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/ItemsSelectionDialog.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/LabeledComboBox.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/LabeledComboBox.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/LabeledComboBox.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/LabeledComboBox.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/LabeledSlider.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/LabeledSlider.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/LabeledSlider.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/LabeledSlider.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/LabeledTextField.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/LabeledTextField.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/LabeledTextField.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/LabeledTextField.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/OptionSelectionDialog.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/OptionSelectionDialog.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/OptionSelectionDialog.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/OptionSelectionDialog.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/PasswordDialog.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/PasswordDialog.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/PasswordDialog.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/PasswordDialog.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/StandardImageIcons.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/StandardImageIcons.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/StandardImageIcons.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/StandardImageIcons.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/TableColumnComparator.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/TableColumnComparator.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/TableColumnComparator.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/TableColumnComparator.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/TableHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/TableHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/TableHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/TableHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/TableHelper2.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/TableHelper2.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/TableHelper2.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/TableHelper2.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/TimePanel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/TimePanel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/TimePanel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/TimePanel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/WindowResizingManager.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/WindowResizingManager.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/WindowResizingManager.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/WindowResizingManager.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/BufferedCanvas.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/BufferedCanvas.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/BufferedCanvas.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/BufferedCanvas.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/CanvasHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/CanvasHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/CanvasHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/CanvasHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/CanvasPainter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/CanvasPainter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/CanvasPainter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/CanvasPainter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataCurvePainter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataCurvePainter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataCurvePainter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataCurvePainter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvas.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvas.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvas.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvas.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasAdapter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasAdapter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasAdapter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasAdapter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasBackgroundPainter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasBackgroundPainter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasBackgroundPainter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasBackgroundPainter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasPainter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasPainter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasPainter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/DataPointCanvasPainter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/PaintableCanvas.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/PaintableCanvas.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/PaintableCanvas.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/PaintableCanvas.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/ScalingHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/ScalingHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/ScalingHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/ScalingHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasEvent.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasEvent.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasEvent.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasEvent.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasEventListener.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasEventListener.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasEventListener.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasEventListener.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasPainter.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasPainter.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasPainter.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/TsCanvasPainter.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/TsPaintableCanvas.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/TsPaintableCanvas.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/TsPaintableCanvas.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/TsPaintableCanvas.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/Viewport.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/Viewport.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/drawing/Viewport.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/drawing/Viewport.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeCellRenderer.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeCellRenderer.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeCellRenderer.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeCellRenderer.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeManager.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeManager.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeManager.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeManager.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeSelectionModel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeSelectionModel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeSelectionModel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jchecktree/CheckTreeSelectionModel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jchecktree/JCheckTreeManager.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jchecktree/JCheckTreeManager.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jchecktree/JCheckTreeManager.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jchecktree/JCheckTreeManager.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/AbstractJTableRowData.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/AbstractJTableRowData.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/AbstractJTableRowData.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/AbstractJTableRowData.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/BaseTableCell.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/BaseTableCell.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/BaseTableCell.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/BaseTableCell.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/CellType.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/CellType.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/CellType.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/CellType.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/ComplexJTableManager.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/ComplexJTableManager.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/ComplexJTableManager.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/ComplexJTableManager.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableCellRenderer.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableCellRenderer.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableCellRenderer.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableCellRenderer.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnComparator.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnComparator.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnComparator.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnComparator.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDescriptor.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDescriptor.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDescriptor.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDescriptor.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDescriptorManager.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDescriptorManager.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDescriptorManager.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDescriptorManager.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDisplaySettings.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDisplaySettings.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDisplaySettings.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableColumnDisplaySettings.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableHeaderRenderer.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableHeaderRenderer.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableHeaderRenderer.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableHeaderRenderer.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableManager.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableManager.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableManager.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableManager.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableModel.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableModel.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableModel.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableModel.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableRowData.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableRowData.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableRowData.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableRowData.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableSortHelper.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableSortHelper.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/JTableSortHelper.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/JTableSortHelper.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/ScrollableJTable.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/ScrollableJTable.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/ScrollableJTable.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/ScrollableJTable.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/TableCellInterface.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/TableCellInterface.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/TableCellInterface.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/TableCellInterface.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/example/ExampleData.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/example/ExampleData.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/example/ExampleData.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/example/ExampleData.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/example/ExampleJTableRowData.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/example/ExampleJTableRowData.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/example/ExampleJTableRowData.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/example/ExampleJTableRowData.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/example/JTableExampleApp.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/example/JTableExampleApp.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/example/JTableExampleApp.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/example/JTableExampleApp.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/example/JTableExampleDataManager.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/example/JTableExampleDataManager.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/gui/jtable/example/JTableExampleDataManager.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/gui/jtable/example/JTableExampleDataManager.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/io/RGBTextFileReader.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/io/RGBTextFileReader.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/io/RGBTextFileReader.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/io/RGBTextFileReader.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/test/EnvTest.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/test/EnvTest.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/test/EnvTest.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/test/EnvTest.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/test/JniTest.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/test/JniTest.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/test/JniTest.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/test/JniTest.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/test/TimeTest.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/test/TimeTest.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/test/TimeTest.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/test/TimeTest.java diff --git a/nativeLib/ohd.common/src/ohd/hseb/util/test/TimingTest.java b/javaUtilities/hydro/ohd.common/src/ohd/hseb/util/test/TimingTest.java similarity index 100% rename from nativeLib/ohd.common/src/ohd/hseb/util/test/TimingTest.java rename to javaUtilities/hydro/ohd.common/src/ohd/hseb/util/test/TimingTest.java diff --git a/nativeLib/ohd.damcrest/.classpath b/javaUtilities/hydro/ohd.damcrest/.classpath similarity index 100% rename from nativeLib/ohd.damcrest/.classpath rename to javaUtilities/hydro/ohd.damcrest/.classpath diff --git a/nativeLib/ohd.damcrest/.project b/javaUtilities/hydro/ohd.damcrest/.project similarity index 100% rename from nativeLib/ohd.damcrest/.project rename to javaUtilities/hydro/ohd.damcrest/.project diff --git a/nativeLib/ohd.damcrest/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.damcrest/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.damcrest/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.damcrest/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.damcrest/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.damcrest/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.damcrest/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.damcrest/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.damcrest/build.properties b/javaUtilities/hydro/ohd.damcrest/build.properties similarity index 100% rename from nativeLib/ohd.damcrest/build.properties rename to javaUtilities/hydro/ohd.damcrest/build.properties diff --git a/nativeLib/ohd.damcrest/build.xml b/javaUtilities/hydro/ohd.damcrest/build.xml similarity index 100% rename from nativeLib/ohd.damcrest/build.xml rename to javaUtilities/hydro/ohd.damcrest/build.xml diff --git a/nativeLib/ohd.damcrest/ohd.damcrest.ecl b/javaUtilities/hydro/ohd.damcrest/ohd.damcrest.ecl similarity index 100% rename from nativeLib/ohd.damcrest/ohd.damcrest.ecl rename to javaUtilities/hydro/ohd.damcrest/ohd.damcrest.ecl diff --git a/nativeLib/ohd.damcrest/scripts/run_damcrest b/javaUtilities/hydro/ohd.damcrest/scripts/run_damcrest similarity index 100% rename from nativeLib/ohd.damcrest/scripts/run_damcrest rename to javaUtilities/hydro/ohd.damcrest/scripts/run_damcrest diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/menu/Launcher.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/menu/Launcher.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/menu/Launcher.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/menu/Launcher.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/DisplayGraphicsPanel.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/DisplayGraphicsPanel.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/DisplayGraphicsPanel.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/DisplayGraphicsPanel.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/FldViewPanel.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/FldViewPanel.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/FldViewPanel.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/FldViewPanel.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/ModelGUI.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/ModelGUI.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/ModelGUI.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/ModelGUI.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/ModelGUI.java_prev b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/ModelGUI.java_prev similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/ModelGUI.java_prev rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/ModelGUI.java_prev diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/OutputManager.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/OutputManager.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/OutputManager.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/OutputManager.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/OutputManager.java_prev b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/OutputManager.java_prev similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/smpdbk/OutputManager.java_prev rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/smpdbk/OutputManager.java_prev diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/AnalysisData.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/AnalysisData.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/AnalysisData.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/AnalysisData.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/DamInputFileFilter.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/DamInputFileFilter.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/DamInputFileFilter.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/DamInputFileFilter.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/DamMapper.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/DamMapper.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/DamMapper.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/DamMapper.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/DownstreamPoint.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/DownstreamPoint.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/DownstreamPoint.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/DownstreamPoint.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/EnumeratedTypes.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/EnumeratedTypes.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/EnumeratedTypes.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/EnumeratedTypes.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/FldXSOutputFileParser.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/FldXSOutputFileParser.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/FldXSOutputFileParser.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/FldXSOutputFileParser.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/MaxLengthDocument.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/MaxLengthDocument.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/MaxLengthDocument.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/MaxLengthDocument.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/ModelOutput.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/ModelOutput.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/ModelOutput.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/ModelOutput.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/ModelScenario.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/ModelScenario.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/ModelScenario.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/ModelScenario.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/NumFormat.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/NumFormat.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/NumFormat.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/NumFormat.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/NumbersOnlyDocument.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/NumbersOnlyDocument.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/NumbersOnlyDocument.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/NumbersOnlyDocument.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/PropertyReader.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/PropertyReader.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/PropertyReader.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/PropertyReader.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/SectionGeometry.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/SectionGeometry.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/SectionGeometry.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/SectionGeometry.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/StreamDirector.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/StreamDirector.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/StreamDirector.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/StreamDirector.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/TabbedPrinter.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/TabbedPrinter.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/TabbedPrinter.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/TabbedPrinter.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/TableMap.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/TableMap.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/TableMap.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/TableMap.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/TablePrinter.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/TablePrinter.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/TablePrinter.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/TablePrinter.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/TableSorter.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/TableSorter.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/TableSorter.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/TableSorter.java diff --git a/nativeLib/ohd.damcrest/src/gov/dambreak/util/UneditableJTableModel.java b/javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/UneditableJTableModel.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/dambreak/util/UneditableJTableModel.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/dambreak/util/UneditableJTableModel.java diff --git a/nativeLib/ohd.damcrest/src/gov/damcat/data/CrossSectionEntryInfo.java b/javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/CrossSectionEntryInfo.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/damcat/data/CrossSectionEntryInfo.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/CrossSectionEntryInfo.java diff --git a/nativeLib/ohd.damcrest/src/gov/damcat/data/DBAccess.java b/javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/DBAccess.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/damcat/data/DBAccess.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/DBAccess.java diff --git a/nativeLib/ohd.damcrest/src/gov/damcat/data/DamInfo.java b/javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/DamInfo.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/damcat/data/DamInfo.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/DamInfo.java diff --git a/nativeLib/ohd.damcrest/src/gov/damcat/data/DownstreamEntryInfo.java b/javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/DownstreamEntryInfo.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/damcat/data/DownstreamEntryInfo.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/DownstreamEntryInfo.java diff --git a/nativeLib/ohd.damcrest/src/gov/damcat/data/EditDam.java b/javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/EditDam.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/damcat/data/EditDam.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/EditDam.java diff --git a/nativeLib/ohd.damcrest/src/gov/damcat/data/InputEntryInfo.java b/javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/InputEntryInfo.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/damcat/data/InputEntryInfo.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/InputEntryInfo.java diff --git a/nativeLib/ohd.damcrest/src/gov/damcat/data/OutputEntryInfo.java b/javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/OutputEntryInfo.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/damcat/data/OutputEntryInfo.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/OutputEntryInfo.java diff --git a/nativeLib/ohd.damcrest/src/gov/damcat/data/Search.java b/javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/Search.java similarity index 100% rename from nativeLib/ohd.damcrest/src/gov/damcat/data/Search.java rename to javaUtilities/hydro/ohd.damcrest/src/gov/damcat/data/Search.java diff --git a/nativeLib/ohd.damcrest/src/ohd/hseb/util/AppsDefaults.java b/javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/AppsDefaults.java similarity index 100% rename from nativeLib/ohd.damcrest/src/ohd/hseb/util/AppsDefaults.java rename to javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/AppsDefaults.java diff --git a/nativeLib/ohd.damcrest/src/ohd/hseb/util/Apps_defaults_test_user.txt b/javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/Apps_defaults_test_user.txt similarity index 100% rename from nativeLib/ohd.damcrest/src/ohd/hseb/util/Apps_defaults_test_user.txt rename to javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/Apps_defaults_test_user.txt diff --git a/nativeLib/ohd.damcrest/src/ohd/hseb/util/CodeTimer.java b/javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/CodeTimer.java similarity index 100% rename from nativeLib/ohd.damcrest/src/ohd/hseb/util/CodeTimer.java rename to javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/CodeTimer.java diff --git a/nativeLib/ohd.damcrest/src/ohd/hseb/util/EnvHelper.java b/javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/EnvHelper.java similarity index 100% rename from nativeLib/ohd.damcrest/src/ohd/hseb/util/EnvHelper.java rename to javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/EnvHelper.java diff --git a/nativeLib/ohd.damcrest/src/ohd/hseb/util/Logger.java b/javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/Logger.java similarity index 100% rename from nativeLib/ohd.damcrest/src/ohd/hseb/util/Logger.java rename to javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/Logger.java diff --git a/nativeLib/ohd.damcrest/src/ohd/hseb/util/NameValuePair.java b/javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/NameValuePair.java similarity index 100% rename from nativeLib/ohd.damcrest/src/ohd/hseb/util/NameValuePair.java rename to javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/NameValuePair.java diff --git a/nativeLib/ohd.damcrest/src/ohd/hseb/util/TimeHelper.java b/javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/TimeHelper.java similarity index 100% rename from nativeLib/ohd.damcrest/src/ohd/hseb/util/TimeHelper.java rename to javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/TimeHelper.java diff --git a/nativeLib/ohd.damcrest/src/ohd/hseb/util/TimeHolder.java b/javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/TimeHolder.java similarity index 100% rename from nativeLib/ohd.damcrest/src/ohd/hseb/util/TimeHolder.java rename to javaUtilities/hydro/ohd.damcrest/src/ohd/hseb/util/TimeHolder.java diff --git a/nativeLib/ohd.damcrestdb/.classpath b/javaUtilities/hydro/ohd.damcrestdb/.classpath similarity index 100% rename from nativeLib/ohd.damcrestdb/.classpath rename to javaUtilities/hydro/ohd.damcrestdb/.classpath diff --git a/nativeLib/ohd.damcrestdb/.project b/javaUtilities/hydro/ohd.damcrestdb/.project similarity index 100% rename from nativeLib/ohd.damcrestdb/.project rename to javaUtilities/hydro/ohd.damcrestdb/.project diff --git a/nativeLib/ohd.damcrestdb/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.damcrestdb/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.damcrestdb/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.damcrestdb/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.damcrestdb/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.damcrestdb/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.damcrestdb/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.damcrestdb/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.damcrestdb/build.properties b/javaUtilities/hydro/ohd.damcrestdb/build.properties similarity index 100% rename from nativeLib/ohd.damcrestdb/build.properties rename to javaUtilities/hydro/ohd.damcrestdb/build.properties diff --git a/nativeLib/ohd.damcrestdb/build.xml b/javaUtilities/hydro/ohd.damcrestdb/build.xml similarity index 100% rename from nativeLib/ohd.damcrestdb/build.xml rename to javaUtilities/hydro/ohd.damcrestdb/build.xml diff --git a/nativeLib/ohd.damcrestdb/ohd.damcrestdb.ecl b/javaUtilities/hydro/ohd.damcrestdb/ohd.damcrestdb.ecl similarity index 100% rename from nativeLib/ohd.damcrestdb/ohd.damcrestdb.ecl rename to javaUtilities/hydro/ohd.damcrestdb/ohd.damcrestdb.ecl diff --git a/nativeLib/ohd.damcrestdb/scripts/create_table_names_file b/javaUtilities/hydro/ohd.damcrestdb/scripts/create_table_names_file similarity index 100% rename from nativeLib/ohd.damcrestdb/scripts/create_table_names_file rename to javaUtilities/hydro/ohd.damcrestdb/scripts/create_table_names_file diff --git a/nativeLib/ohd.damcrestdb/scripts/make_table_names.txt b/javaUtilities/hydro/ohd.damcrestdb/scripts/make_table_names.txt similarity index 100% rename from nativeLib/ohd.damcrestdb/scripts/make_table_names.txt rename to javaUtilities/hydro/ohd.damcrestdb/scripts/make_table_names.txt diff --git a/nativeLib/ohd.damcrestdb/scripts/run_damcrest_cdbgen b/javaUtilities/hydro/ohd.damcrestdb/scripts/run_damcrest_cdbgen similarity index 100% rename from nativeLib/ohd.damcrestdb/scripts/run_damcrest_cdbgen rename to javaUtilities/hydro/ohd.damcrestdb/scripts/run_damcrest_cdbgen diff --git a/nativeLib/ohd.damcrestdb/scripts/run_damcrest_jdbgen b/javaUtilities/hydro/ohd.damcrestdb/scripts/run_damcrest_jdbgen similarity index 100% rename from nativeLib/ohd.damcrestdb/scripts/run_damcrest_jdbgen rename to javaUtilities/hydro/ohd.damcrestdb/scripts/run_damcrest_jdbgen diff --git a/nativeLib/ohd.db/.classpath b/javaUtilities/hydro/ohd.db/.classpath similarity index 100% rename from nativeLib/ohd.db/.classpath rename to javaUtilities/hydro/ohd.db/.classpath diff --git a/nativeLib/ohd.db/.project b/javaUtilities/hydro/ohd.db/.project similarity index 100% rename from nativeLib/ohd.db/.project rename to javaUtilities/hydro/ohd.db/.project diff --git a/nativeLib/ohd.db/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.db/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.db/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.db/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.db/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.db/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.db/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.db/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.db/build.properties b/javaUtilities/hydro/ohd.db/build.properties similarity index 100% rename from nativeLib/ohd.db/build.properties rename to javaUtilities/hydro/ohd.db/build.properties diff --git a/nativeLib/ohd.db/build.xml b/javaUtilities/hydro/ohd.db/build.xml similarity index 100% rename from nativeLib/ohd.db/build.xml rename to javaUtilities/hydro/ohd.db/build.xml diff --git a/nativeLib/ohd.db/ohd.db.ecl b/javaUtilities/hydro/ohd.db/ohd.db.ecl similarity index 100% rename from nativeLib/ohd.db/ohd.db.ecl rename to javaUtilities/hydro/ohd.db/ohd.db.ecl diff --git a/nativeLib/ohd.db/src/ohd/hseb/db/Database.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/db/Database.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/db/Database.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/db/Database.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/db/DbArrayColumn.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbArrayColumn.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/db/DbArrayColumn.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbArrayColumn.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/db/DbConnectionHelper.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbConnectionHelper.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/db/DbConnectionHelper.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbConnectionHelper.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/db/DbRecord.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbRecord.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/db/DbRecord.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbRecord.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/db/DbTable.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbTable.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/db/DbTable.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbTable.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/db/DbTimeHelper.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbTimeHelper.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/db/DbTimeHelper.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbTimeHelper.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/db/DbType.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbType.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/db/DbType.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/db/DbType.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/dbgen/CDbGen.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/CDbGen.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/dbgen/CDbGen.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/CDbGen.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/dbgen/CodeIndenter.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/CodeIndenter.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/dbgen/CodeIndenter.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/CodeIndenter.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/dbgen/ColumnDescriptor.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/ColumnDescriptor.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/dbgen/ColumnDescriptor.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/ColumnDescriptor.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/dbgen/JDbGen.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/JDbGen.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/dbgen/JDbGen.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/JDbGen.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/dbgen/SchemaDescriber.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/SchemaDescriber.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/dbgen/SchemaDescriber.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/SchemaDescriber.java diff --git a/nativeLib/ohd.db/src/ohd/hseb/dbgen/TableDescriptor.java b/javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/TableDescriptor.java similarity index 100% rename from nativeLib/ohd.db/src/ohd/hseb/dbgen/TableDescriptor.java rename to javaUtilities/hydro/ohd.db/src/ohd/hseb/dbgen/TableDescriptor.java diff --git a/nativeLib/ohd.dimensions_file_uploader/.classpath b/javaUtilities/hydro/ohd.dimensions_file_uploader/.classpath similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/.classpath rename to javaUtilities/hydro/ohd.dimensions_file_uploader/.classpath diff --git a/nativeLib/ohd.dimensions_file_uploader/.project b/javaUtilities/hydro/ohd.dimensions_file_uploader/.project similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/.project rename to javaUtilities/hydro/ohd.dimensions_file_uploader/.project diff --git a/nativeLib/ohd.dimensions_file_uploader/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.dimensions_file_uploader/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.dimensions_file_uploader/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.dimensions_file_uploader/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.dimensions_file_uploader/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.dimensions_file_uploader/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.dimensions_file_uploader/build.properties b/javaUtilities/hydro/ohd.dimensions_file_uploader/build.properties similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/build.properties rename to javaUtilities/hydro/ohd.dimensions_file_uploader/build.properties diff --git a/nativeLib/ohd.dimensions_file_uploader/build.xml b/javaUtilities/hydro/ohd.dimensions_file_uploader/build.xml similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/build.xml rename to javaUtilities/hydro/ohd.dimensions_file_uploader/build.xml diff --git a/nativeLib/ohd.dimensions_file_uploader/ohd.dimensions_file_uploader.ecl b/javaUtilities/hydro/ohd.dimensions_file_uploader/ohd.dimensions_file_uploader.ecl similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/ohd.dimensions_file_uploader.ecl rename to javaUtilities/hydro/ohd.dimensions_file_uploader/ohd.dimensions_file_uploader.ecl diff --git a/nativeLib/ohd.dimensions_file_uploader/scripts/run_dimensions_file_uploader b/javaUtilities/hydro/ohd.dimensions_file_uploader/scripts/run_dimensions_file_uploader similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/scripts/run_dimensions_file_uploader rename to javaUtilities/hydro/ohd.dimensions_file_uploader/scripts/run_dimensions_file_uploader diff --git a/nativeLib/ohd.dimensions_file_uploader/scripts/upload_file_to_dimensions b/javaUtilities/hydro/ohd.dimensions_file_uploader/scripts/upload_file_to_dimensions similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/scripts/upload_file_to_dimensions rename to javaUtilities/hydro/ohd.dimensions_file_uploader/scripts/upload_file_to_dimensions diff --git a/nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/Dimensions_File_Uploader.java b/javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/Dimensions_File_Uploader.java similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/Dimensions_File_Uploader.java rename to javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/Dimensions_File_Uploader.java diff --git a/nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/LogViewer.java b/javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/LogViewer.java similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/LogViewer.java rename to javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/LogViewer.java diff --git a/nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/NewDimensions_File_Uploader.java b/javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/NewDimensions_File_Uploader.java similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/NewDimensions_File_Uploader.java rename to javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/NewDimensions_File_Uploader.java diff --git a/nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/PasswordDialog.java b/javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/PasswordDialog.java similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/PasswordDialog.java rename to javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/PasswordDialog.java diff --git a/nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/StreamDrainer.java b/javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/StreamDrainer.java similarity index 100% rename from nativeLib/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/StreamDrainer.java rename to javaUtilities/hydro/ohd.dimensions_file_uploader/src/ohd/hseb/dimensions_file_uploader/StreamDrainer.java diff --git a/nativeLib/ohd.fcstservice/.classpath b/javaUtilities/hydro/ohd.fcstservice/.classpath similarity index 100% rename from nativeLib/ohd.fcstservice/.classpath rename to javaUtilities/hydro/ohd.fcstservice/.classpath diff --git a/nativeLib/ohd.fcstservice/.project b/javaUtilities/hydro/ohd.fcstservice/.project similarity index 100% rename from nativeLib/ohd.fcstservice/.project rename to javaUtilities/hydro/ohd.fcstservice/.project diff --git a/nativeLib/ohd.fcstservice/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.fcstservice/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.fcstservice/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.fcstservice/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.fcstservice/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.fcstservice/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.fcstservice/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.fcstservice/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.fcstservice/build.properties b/javaUtilities/hydro/ohd.fcstservice/build.properties similarity index 100% rename from nativeLib/ohd.fcstservice/build.properties rename to javaUtilities/hydro/ohd.fcstservice/build.properties diff --git a/nativeLib/ohd.fcstservice/build.xml b/javaUtilities/hydro/ohd.fcstservice/build.xml similarity index 100% rename from nativeLib/ohd.fcstservice/build.xml rename to javaUtilities/hydro/ohd.fcstservice/build.xml diff --git a/nativeLib/ohd.fcstservice/ohd.fcstservice.ecl b/javaUtilities/hydro/ohd.fcstservice/ohd.fcstservice.ecl similarity index 100% rename from nativeLib/ohd.fcstservice/ohd.fcstservice.ecl rename to javaUtilities/hydro/ohd.fcstservice/ohd.fcstservice.ecl diff --git a/nativeLib/ohd.fcstservice/scripts/start_fcstservice b/javaUtilities/hydro/ohd.fcstservice/scripts/start_fcstservice similarity index 100% rename from nativeLib/ohd.fcstservice/scripts/start_fcstservice rename to javaUtilities/hydro/ohd.fcstservice/scripts/start_fcstservice diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/DataServicesGlobals.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/DataServicesGlobals.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/DataServicesGlobals.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/DataServicesGlobals.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataDetermWindow.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataDetermWindow.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataDetermWindow.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataDetermWindow.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataEnsembleWindow.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataEnsembleWindow.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataEnsembleWindow.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataEnsembleWindow.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataServiceWindow.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataServiceWindow.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataServiceWindow.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataServiceWindow.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataWatSupWindow.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataWatSupWindow.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataWatSupWindow.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstDataWatSupWindow.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstGenMethodJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstGenMethodJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstGenMethodJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstGenMethodJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstHorizonJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstHorizonJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstHorizonJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstHorizonJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtDetermJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtDetermJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtDetermJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtDetermJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtEnsembleJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtEnsembleJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtEnsembleJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtEnsembleJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtServiceJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtServiceJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtServiceJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtServiceJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtWatSupJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtWatSupJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtWatSupJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstPtWatSupJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstTypeJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstTypeJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstTypeJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FcstTypeJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FlowTypeJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FlowTypeJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FlowTypeJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FlowTypeJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FrequencyUpdateJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FrequencyUpdateJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/FrequencyUpdateJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/FrequencyUpdateJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/HydrologicMethodJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/HydrologicMethodJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/HydrologicMethodJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/HydrologicMethodJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/IssueCriteriaJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/IssueCriteriaJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/IssueCriteriaJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/IssueCriteriaJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmApplicationWindow.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmApplicationWindow.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmApplicationWindow.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmApplicationWindow.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmDataManager.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmDataManager.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmDataManager.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmDataManager.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmLogger.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmLogger.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmLogger.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/LhvmLogger.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/LocationJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/LocationJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/LocationJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/LocationJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/Observer.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/Observer.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/Observer.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/Observer.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/PostProcessingJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/PostProcessingJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/PostProcessingJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/PostProcessingJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ReferenceTablesWindow.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ReferenceTablesWindow.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ReferenceTablesWindow.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ReferenceTablesWindow.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/RequiredPeriodJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/RequiredPeriodJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/RequiredPeriodJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/RequiredPeriodJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ReservoirModelJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ReservoirModelJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ReservoirModelJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ReservoirModelJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/RespAgencyJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/RespAgencyJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/RespAgencyJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/RespAgencyJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/RoutingMethodJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/RoutingMethodJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/RoutingMethodJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/RoutingMethodJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ServiceTableViewViewJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ServiceTableViewViewJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ServiceTableViewViewJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ServiceTableViewViewJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ServiceTypeJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ServiceTypeJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ServiceTypeJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ServiceTypeJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ServicesDbWindowAdapter.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ServicesDbWindowAdapter.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/ServicesDbWindowAdapter.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/ServicesDbWindowAdapter.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/SnowMethodJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/SnowMethodJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/SnowMethodJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/SnowMethodJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/SpringUtilities.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/SpringUtilities.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/SpringUtilities.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/SpringUtilities.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/Subject.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/Subject.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/Subject.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/Subject.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/VerificationResponseTypeJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/VerificationResponseTypeJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/VerificationResponseTypeJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/VerificationResponseTypeJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupCoordAgencyJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupCoordAgencyJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupCoordAgencyJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupCoordAgencyJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupCriterionJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupCriterionJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupCriterionJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupCriterionJTableRowData.java diff --git a/nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupMethodJTableRowData.java b/javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupMethodJTableRowData.java similarity index 100% rename from nativeLib/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupMethodJTableRowData.java rename to javaUtilities/hydro/ohd.fcstservice/src/ohd/hseb/fcstservice/WatSupMethodJTableRowData.java diff --git a/nativeLib/ohd.ihfsdb/.classpath b/javaUtilities/hydro/ohd.ihfsdb/.classpath similarity index 100% rename from nativeLib/ohd.ihfsdb/.classpath rename to javaUtilities/hydro/ohd.ihfsdb/.classpath diff --git a/nativeLib/ohd.ihfsdb/.project b/javaUtilities/hydro/ohd.ihfsdb/.project similarity index 100% rename from nativeLib/ohd.ihfsdb/.project rename to javaUtilities/hydro/ohd.ihfsdb/.project diff --git a/nativeLib/ohd.ihfsdb/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.ihfsdb/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.ihfsdb/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.ihfsdb/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.ihfsdb/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.ihfsdb/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.ihfsdb/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.ihfsdb/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.ihfsdb/PreferredTableNames.txt b/javaUtilities/hydro/ohd.ihfsdb/PreferredTableNames.txt similarity index 100% rename from nativeLib/ohd.ihfsdb/PreferredTableNames.txt rename to javaUtilities/hydro/ohd.ihfsdb/PreferredTableNames.txt diff --git a/nativeLib/ohd.ihfsdb/REQUIRED_JARS/postgresql-8.3-603.jdbc3.jar b/javaUtilities/hydro/ohd.ihfsdb/REQUIRED_JARS/postgresql-8.3-603.jdbc3.jar similarity index 100% rename from nativeLib/ohd.ihfsdb/REQUIRED_JARS/postgresql-8.3-603.jdbc3.jar rename to javaUtilities/hydro/ohd.ihfsdb/REQUIRED_JARS/postgresql-8.3-603.jdbc3.jar diff --git a/nativeLib/ohd.ihfsdb/build.properties b/javaUtilities/hydro/ohd.ihfsdb/build.properties similarity index 100% rename from nativeLib/ohd.ihfsdb/build.properties rename to javaUtilities/hydro/ohd.ihfsdb/build.properties diff --git a/nativeLib/ohd.ihfsdb/build.xml b/javaUtilities/hydro/ohd.ihfsdb/build.xml similarity index 100% rename from nativeLib/ohd.ihfsdb/build.xml rename to javaUtilities/hydro/ohd.ihfsdb/build.xml diff --git a/nativeLib/ohd.ihfsdb/generate.xml b/javaUtilities/hydro/ohd.ihfsdb/generate.xml similarity index 100% rename from nativeLib/ohd.ihfsdb/generate.xml rename to javaUtilities/hydro/ohd.ihfsdb/generate.xml diff --git a/nativeLib/ohd.ihfsdb/ohd.ihfsdb.ecl b/javaUtilities/hydro/ohd.ihfsdb/ohd.ihfsdb.ecl similarity index 100% rename from nativeLib/ohd.ihfsdb/ohd.ihfsdb.ecl rename to javaUtilities/hydro/ohd.ihfsdb/ohd.ihfsdb.ecl diff --git a/nativeLib/ohd.ihfsdb/scripts/create_table_names_file b/javaUtilities/hydro/ohd.ihfsdb/scripts/create_table_names_file similarity index 100% rename from nativeLib/ohd.ihfsdb/scripts/create_table_names_file rename to javaUtilities/hydro/ohd.ihfsdb/scripts/create_table_names_file diff --git a/nativeLib/ohd.ihfsdb/scripts/make_table_names.txt b/javaUtilities/hydro/ohd.ihfsdb/scripts/make_table_names.txt similarity index 100% rename from nativeLib/ohd.ihfsdb/scripts/make_table_names.txt rename to javaUtilities/hydro/ohd.ihfsdb/scripts/make_table_names.txt diff --git a/nativeLib/ohd.ihfsdb/scripts/run_ihfs_cdbgen b/javaUtilities/hydro/ohd.ihfsdb/scripts/run_ihfs_cdbgen similarity index 100% rename from nativeLib/ohd.ihfsdb/scripts/run_ihfs_cdbgen rename to javaUtilities/hydro/ohd.ihfsdb/scripts/run_ihfs_cdbgen diff --git a/nativeLib/ohd.ihfsdb/scripts/run_ihfs_jdbgen b/javaUtilities/hydro/ohd.ihfsdb/scripts/run_ihfs_jdbgen similarity index 100% rename from nativeLib/ohd.ihfsdb/scripts/run_ihfs_jdbgen rename to javaUtilities/hydro/ohd.ihfsdb/scripts/run_ihfs_jdbgen diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdjustFactorRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdjustFactorRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdjustFactorRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdjustFactorRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdjustFactorTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdjustFactorTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdjustFactorTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdjustFactorTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdminRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdminRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdminRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdminRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdminTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdminTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdminTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AdminTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgencyOfficeUniqueRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgencyOfficeUniqueRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgencyOfficeUniqueRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgencyOfficeUniqueRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgencyOfficeUniqueView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgencyOfficeUniqueView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgencyOfficeUniqueView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgencyOfficeUniqueView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgriculturalRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgriculturalRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgriculturalRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgriculturalRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgriculturalTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgriculturalTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgriculturalTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AgriculturalTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AlertAlarmValRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AlertAlarmValRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AlertAlarmValRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AlertAlarmValRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AlertAlarmValTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AlertAlarmValTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AlertAlarmValTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/AlertAlarmValTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealFcstRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealFcstRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealFcstRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealFcstRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealFcstTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealFcstTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealFcstTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealFcstTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealObsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealObsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealObsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealObsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealObsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealObsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealObsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ArealObsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/BenchmarkRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/BenchmarkRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/BenchmarkRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/BenchmarkRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/BenchmarkTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/BenchmarkTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/BenchmarkTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/BenchmarkTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CityRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CityRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CityRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CityRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CityTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CityTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CityTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CityTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorNameRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorNameRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorNameRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorNameRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorNameTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorNameTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorNameTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorNameTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorOverlayRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorOverlayRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorOverlayRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorOverlayRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorOverlayTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorOverlayTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorOverlayTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorOverlayTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorValueRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorValueRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorValueRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorValueRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorValueTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorValueTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorValueTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ColorValueTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CommentValueRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CommentValueRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CommentValueRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CommentValueRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CommentValueTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CommentValueTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CommentValueTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CommentValueTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContactsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContactsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContactsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContactsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContactsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContactsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContactsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContactsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContingencyValueRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContingencyValueRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContingencyValueRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContingencyValueRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContingencyValueTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContingencyValueTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContingencyValueTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ContingencyValueTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopCommsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopCommsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopCommsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopCommsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopCommsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopCommsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopCommsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopCommsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopRecipRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopRecipRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopRecipRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopRecipRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopRecipTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopRecipTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopRecipTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopRecipTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopSponsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopSponsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopSponsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopSponsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopSponsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopSponsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopSponsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CoopSponsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountiesRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountiesRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountiesRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountiesRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountiesTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountiesTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountiesTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountiesTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyInfoRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyInfoRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyInfoRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyInfoRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyInfoView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyInfoView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyInfoView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyInfoView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyTransmitRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyTransmitRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyTransmitRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyTransmitRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyTransmitTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyTransmitTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyTransmitTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountyTransmitTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountynumRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountynumRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountynumRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountynumRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountynumTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountynumTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountynumTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CountynumTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CrestRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CrestRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CrestRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CrestRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CrestTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CrestTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CrestTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CrestTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPCRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPCRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPCRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPCRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPCTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPCTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPCTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPCTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPPRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPPRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPPRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPPRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPPTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPPTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPPTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/CurPPTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DPARadarRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DPARadarRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DPARadarRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DPARadarRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DPARadarTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DPARadarTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DPARadarTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DPARadarTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DailyPPRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DailyPPRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DailyPPRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DailyPPRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DailyPPTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DailyPPTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DailyPPTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DailyPPTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DamTypesRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DamTypesRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DamTypesRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DamTypesRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DamTypesTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DamTypesTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DamTypesTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DamTypesTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DataLimitsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DataLimitsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DataLimitsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DataLimitsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DataLimitsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DataLimitsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DataLimitsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DataLimitsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DatumRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DatumRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DatumRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DatumRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DatumTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DatumTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DatumTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DatumTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpOwnerRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpOwnerRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpOwnerRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpOwnerRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpOwnerTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpOwnerTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpOwnerTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpOwnerTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DcpTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DefiningIssueCriteriaRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DefiningIssueCriteriaRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DefiningIssueCriteriaRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DefiningIssueCriteriaRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DefiningIssueCriteriaTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DefiningIssueCriteriaTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DefiningIssueCriteriaTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DefiningIssueCriteriaTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DescripRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DescripRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DescripRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DescripRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DescripTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DescripTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DescripTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DescripTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DischargeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DischargeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DischargeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DischargeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DischargeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DischargeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DischargeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DischargeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DpaAdaptRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DpaAdaptRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DpaAdaptRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DpaAdaptRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DpaAdaptTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DpaAdaptTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DpaAdaptTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/DpaAdaptTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EligzonRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EligzonRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EligzonRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EligzonRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EligzonTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EligzonTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EligzonTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EligzonTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EvaporationRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EvaporationRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EvaporationRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EvaporationRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EvaporationTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EvaporationTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EvaporationTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/EvaporationTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstDischargeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstDischargeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstDischargeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstDischargeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstDischargeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstDischargeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstDischargeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstDischargeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstGenMethodRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstGenMethodRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstGenMethodRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstGenMethodRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstGenMethodTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstGenMethodTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstGenMethodTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstGenMethodTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHeightRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHeightRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHeightRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHeightRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHeightTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHeightTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHeightTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHeightTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHorizonRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHorizonRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHorizonRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHorizonRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHorizonTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHorizonTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHorizonTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstHorizonTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstOtherRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstOtherRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstOtherRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstOtherRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstOtherTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstOtherTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstOtherTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstOtherTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPrecipRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPrecipRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPrecipRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPrecipRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPrecipTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPrecipTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPrecipTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPrecipTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtDetermRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtDetermRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtDetermRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtDetermRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtDetermTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtDetermTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtDetermTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtDetermTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtESPRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtESPRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtESPRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtESPRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtESPTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtESPTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtESPTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtESPTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtServiceRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtServiceRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtServiceRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtServiceRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtServiceTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtServiceTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtServiceTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtServiceTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtWatSupRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtWatSupRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtWatSupRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtWatSupRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtWatSupTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtWatSupTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtWatSupTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstPtWatSupTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTemperatureRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTemperatureRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTemperatureRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTemperatureRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTemperatureTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTemperatureTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTemperatureTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTemperatureTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTypeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTypeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTypeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTypeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTypeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTypeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTypeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FcstTypeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FishCountRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FishCountRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FishCountRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FishCountRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FishCountTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FishCountTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FishCountTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FishCountTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodTsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodcatRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodcatRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodcatRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodcatRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodcatTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodcatTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodcatTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodcatTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodstmtRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodstmtRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodstmtRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodstmtRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodstmtTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodstmtTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodstmtTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FloodstmtTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FlowTypeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FlowTypeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FlowTypeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FlowTypeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FlowTypeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FlowTypeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FlowTypeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FlowTypeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpInfoRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpInfoRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpInfoRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpInfoRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpInfoView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpInfoView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpInfoView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpInfoView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdPracticeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdPracticeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdPracticeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdPracticeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdPracticeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdPracticeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdPracticeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdPracticeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FpPrevProdTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FrequencyUpdateRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FrequencyUpdateRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FrequencyUpdateRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FrequencyUpdateRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FrequencyUpdateTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FrequencyUpdateTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FrequencyUpdateTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/FrequencyUpdateTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageMaintRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageMaintRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageMaintRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageMaintRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageMaintTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageMaintTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageMaintTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageMaintTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageOwnerRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageOwnerRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageOwnerRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageOwnerRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageOwnerTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageOwnerTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageOwnerTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageOwnerTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTypeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTypeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTypeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTypeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTypeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTypeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTypeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GageTypeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GateDamRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GateDamRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GateDamRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GateDamRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GateDamTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GateDamTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GateDamTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GateDamTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GeoAreaRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GeoAreaRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GeoAreaRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GeoAreaRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GeoAreaTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GeoAreaTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GeoAreaTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GeoAreaTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GroundRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GroundRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GroundRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GroundRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GroundTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GroundTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GroundTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/GroundTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HeightRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HeightRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HeightRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HeightRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HeightTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HeightTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HeightTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HeightTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HgStationRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HgStationRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HgStationRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HgStationRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HgStationTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HgStationTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HgStationTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HgStationTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPCRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPCRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPCRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPCRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPCTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPCTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPCTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPCTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPPRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPPRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPPRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPPRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPPTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPPTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPPTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HourlyPPTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HsaRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HsaRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HsaRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HsaRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HsaTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HsaTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HsaTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HsaTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HvStationRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HvStationRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HvStationRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HvStationRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HvStationView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HvStationView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HvStationView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HvStationView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HwStagesRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HwStagesRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HwStagesRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HwStagesRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HwStagesView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HwStagesView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HwStagesView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HwStagesView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HydrologicMethodRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HydrologicMethodRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HydrologicMethodRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HydrologicMethodRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HydrologicMethodTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HydrologicMethodTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HydrologicMethodTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/HydrologicMethodTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IceRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IceRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IceRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IceRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IceTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IceTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IceTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IceTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IngestFilterRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IngestFilterRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IngestFilterRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IngestFilterRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IngestFilterTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IngestFilterTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IngestFilterTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/IngestFilterTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LWstmtRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LWstmtRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LWstmtRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LWstmtRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LWstmtTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LWstmtTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LWstmtTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LWstmtTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LakeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LakeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LakeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LakeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LakeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LakeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LakeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LakeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LatestObsValueRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LatestObsValueRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LatestObsValueRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LatestObsValueRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LatestObsValueTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LatestObsValueTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LatestObsValueTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LatestObsValueTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LightningRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LightningRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LightningRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LightningRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LightningTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LightningTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LightningTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LightningTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LineSegsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LineSegsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LineSegsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LineSegsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LineSegsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LineSegsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LineSegsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LineSegsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocAreaRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocAreaRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocAreaRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocAreaRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocAreaTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocAreaTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocAreaTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocAreaTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocClassRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocClassRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocClassRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocClassRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocClassView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocClassView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocClassView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocClassView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocDataLimitsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocDataLimitsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocDataLimitsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocDataLimitsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocDataLimitsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocDataLimitsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocDataLimitsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocDataLimitsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocExtAgencyRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocExtAgencyRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocExtAgencyRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocExtAgencyRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocExtAgencyTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocExtAgencyTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocExtAgencyTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocExtAgencyTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocImageRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocImageRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocImageRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocImageRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocImageTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocImageTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocImageTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocImageTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocPDCRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocPDCRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocPDCRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocPDCRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocPDCView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocPDCView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocPDCView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocPDCView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocRiverMonRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocRiverMonRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocRiverMonRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocRiverMonRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocRiverMonView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocRiverMonView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocRiverMonView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocRiverMonView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocTransmitRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocTransmitRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocTransmitRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocTransmitRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocTransmitView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocTransmitView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocTransmitView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocTransmitView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocViewRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocViewRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocViewRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocViewRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocViewView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocViewView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocViewView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocViewView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocWfoRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocWfoRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocWfoRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocWfoRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocWfoView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocWfoView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocWfoView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocWfoView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocationRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocationRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocationRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocationRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocationTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocationTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocationTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LocationTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LowwaterRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LowwaterRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LowwaterRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LowwaterRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LowwaterTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LowwaterTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LowwaterTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/LowwaterTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MoistureRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MoistureRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MoistureRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MoistureRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MoistureTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MoistureTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MoistureTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MoistureTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MonthlyValuesRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MonthlyValuesRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MonthlyValuesRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MonthlyValuesRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MonthlyValuesTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MonthlyValuesTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MonthlyValuesTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/MonthlyValuesTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NWRTransmitterRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NWRTransmitterRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NWRTransmitterRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NWRTransmitterRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NWRTransmitterTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NWRTransmitterTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NWRTransmitterTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NWRTransmitterTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NetworkRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NetworkRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NetworkRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NetworkRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NetworkTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NetworkTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NetworkTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/NetworkTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSDataTransRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSDataTransRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSDataTransRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSDataTransRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSDataTransTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSDataTransTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSDataTransTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSDataTransTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSStnTransRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSStnTransRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSStnTransRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSStnTransRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSStnTransTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSStnTransTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSStnTransTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OFSStnTransTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ObserverRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ObserverRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ObserverRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ObserverRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ObserverTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ObserverTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ObserverTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ObserverTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OfficeNotesRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OfficeNotesRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OfficeNotesRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OfficeNotesRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OfficeNotesTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OfficeNotesTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OfficeNotesTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/OfficeNotesTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PairedValueRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PairedValueRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PairedValueRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PairedValueRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PairedValueTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PairedValueTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PairedValueTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PairedValueTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PerfLogRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PerfLogRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PerfLogRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PerfLogRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PerfLogTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PerfLogTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PerfLogTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PerfLogTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PointDataPresetsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PointDataPresetsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PointDataPresetsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PointDataPresetsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PointDataPresetsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PointDataPresetsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PointDataPresetsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PointDataPresetsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PostProcessorRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PostProcessorRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PostProcessorRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PostProcessorRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PostProcessorTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PostProcessorTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PostProcessorTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PostProcessorTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PowerRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PowerRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PowerRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PowerRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PowerTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PowerTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PowerTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PowerTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PressureRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PressureRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PressureRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PressureRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PressureTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PressureTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PressureTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PressureTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PrevProdRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PrevProdRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PrevProdRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PrevProdRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PrevProdView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PrevProdView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PrevProdView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PrevProdView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProcValueRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProcValueRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProcValueRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProcValueRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProcValueTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProcValueTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProcValueTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProcValueTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProductLinkRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProductLinkRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProductLinkRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProductLinkRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProductLinkTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProductLinkTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProductLinkTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProductLinkTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProximityRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProximityRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProximityRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProximityRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProximityTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProximityTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProximityTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ProximityTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PseudoGageValRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PseudoGageValRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PseudoGageValRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PseudoGageValRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PseudoGageValTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PseudoGageValTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PseudoGageValTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PseudoGageValTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PubRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PubRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PubRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PubRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PubTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PubTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PubTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PubTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeDynDataRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeDynDataRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeDynDataRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeDynDataRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeDynDataTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeDynDataTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeDynDataTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeDynDataTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeProductRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeProductRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeProductRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeProductRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeProductTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeProductTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeProductTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/PurgeProductTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasDynRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasDynRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasDynRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasDynRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasDynTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasDynTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasDynTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasDynTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasStatRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasStatRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasStatRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasStatRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasStatTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasStatTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasStatTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWBiasStatTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWParamsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWParamsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWParamsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWParamsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWParamsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWParamsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWParamsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWParamsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWPrefsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWPrefsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWPrefsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWPrefsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWPrefsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWPrefsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWPrefsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWPrefsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWRadarResultRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWRadarResultRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWRadarResultRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWRadarResultRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWRadarResultTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWRadarResultTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWRadarResultTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWRadarResultTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWResultRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWResultRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWResultRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWResultRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWResultTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWResultTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWResultTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RWResultTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarLocRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarLocRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarLocRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarLocRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarLocTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarLocTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarLocTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarLocTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarRespRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarRespRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarRespRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarRespRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarRespTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarRespTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarRespTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadarRespTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadiationRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadiationRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadiationRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadiationRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadiationTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadiationTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadiationTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RadiationTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingShiftRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingShiftRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingShiftRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingShiftRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingShiftTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingShiftTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingShiftTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingShiftTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RatingTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPCRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPCRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPCRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPCRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPCTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPCTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPCTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPCTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPPRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPPRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPPRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPPRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPPTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPPTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPPTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPPTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPotherRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPotherRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPotherRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPotherRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPotherTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPotherTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPotherTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RawPotherTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReferRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReferRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReferRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReferRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReferTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReferTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReferTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReferTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RejectedDataRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RejectedDataRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RejectedDataRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RejectedDataRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RejectedDataTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RejectedDataTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RejectedDataTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RejectedDataTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RequiredPeriodRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RequiredPeriodRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RequiredPeriodRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RequiredPeriodRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RequiredPeriodTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RequiredPeriodTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RequiredPeriodTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RequiredPeriodTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ResOwnerRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ResOwnerRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ResOwnerRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ResOwnerRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ResOwnerTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ResOwnerTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ResOwnerTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ResOwnerTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RescapRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RescapRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RescapRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RescapRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RescapTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RescapTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RescapTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RescapTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirModelRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirModelRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirModelRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirModelRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirModelTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirModelTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirModelTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirModelTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ReservoirTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RfcRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RfcRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RfcRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RfcRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RfcTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RfcTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RfcTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RfcTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonGroupRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonGroupRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonGroupRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonGroupRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonGroupTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonGroupTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonGroupTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonGroupTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonLocationRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonLocationRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonLocationRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonLocationRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonLocationTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonLocationTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonLocationTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverMonLocationTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverStatusRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverStatusRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverStatusRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverStatusRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverStatusTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverStatusTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverStatusTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverStatusTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverstatRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverstatRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverstatRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverstatRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverstatTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverstatTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverstatTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RiverstatTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RoutingMethodRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RoutingMethodRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RoutingMethodRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RoutingMethodRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RoutingMethodTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RoutingMethodTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RoutingMethodTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RoutingMethodTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstGroupRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstGroupRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstGroupRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstGroupRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstGroupTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstGroupTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstGroupTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstGroupTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstPointRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstPointRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstPointRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstPointRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstPointTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstPointTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstPointTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfFcstPointTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfParamsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfParamsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfParamsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfParamsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfParamsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfParamsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfParamsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/RpfParamsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalParamsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalParamsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalParamsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalParamsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalParamsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalParamsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalParamsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalParamsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalPrefsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalPrefsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalPrefsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalPrefsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalPrefsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalPrefsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalPrefsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/S3PostAnalPrefsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaParamsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaParamsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaParamsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaParamsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaParamsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaParamsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaParamsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaParamsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaStateRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaStateRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaStateRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaStateRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaStateTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaStateTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaStateTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SacSmaStateTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTableViewRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTableViewRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTableViewRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTableViewRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTableViewView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTableViewView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTableViewView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTableViewView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTypeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTypeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTypeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTypeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTypeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTypeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTypeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ServiceTypeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefDurRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefDurRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefDurRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefDurRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefDurTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefDurTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefDurTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefDurTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefExRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefExRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefExRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefExRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefExTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefExTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefExTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefExTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPETransRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPETransRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPETransRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPETransRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPETransTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPETransTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPETransTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPETransTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefPeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefProbRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefProbRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefProbRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefProbRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefProbTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefProbTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefProbTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefProbTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefQcRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefQcRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefQcRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefQcRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefQcTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefQcTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefQcTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefQcTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefTsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefTsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefTsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefTsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefTsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefTsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefTsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ShefTsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowMethodRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowMethodRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowMethodRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowMethodRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowMethodTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowMethodTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowMethodTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowMethodTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SnowTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SshpConfigRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SshpConfigRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SshpConfigRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SshpConfigRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SshpConfigTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SshpConfigTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SshpConfigTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/SshpConfigTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StatProfRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StatProfRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StatProfRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StatProfRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StatProfView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StatProfView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StatProfView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StatProfView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StateRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StateRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StateRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StateRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StateTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StateTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StateTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StateTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StationListRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StationListRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StationListRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StationListRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StationListView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StationListView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StationListView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StationListView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StnClassRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StnClassRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StnClassRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StnClassRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StnClassTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StnClassTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StnClassTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/StnClassTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelemRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelemRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelemRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelemRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelemTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelemTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelemTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelemTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmOwnerRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmOwnerRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmOwnerRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmOwnerRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmOwnerTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmOwnerTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmOwnerTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmOwnerTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmPayorRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmPayorRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmPayorRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmPayorRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmPayorTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmPayorTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmPayorTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmPayorTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmTypeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmTypeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmTypeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmTypeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmTypeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmTypeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmTypeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TelmTypeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TemperatureRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TemperatureRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TemperatureRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TemperatureRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TemperatureTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TemperatureTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TemperatureTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TemperatureTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TextProductRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TextProductRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TextProductRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TextProductRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TextProductTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TextProductTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TextProductTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TextProductTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TimeZoneRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TimeZoneRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TimeZoneRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TimeZoneRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TimeZoneTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TimeZoneTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TimeZoneTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/TimeZoneTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnitGraphRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnitGraphRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnitGraphRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnitGraphRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnitGraphTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnitGraphTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnitGraphTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnitGraphTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnValueRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnValueRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnValueRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnValueRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnValueTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnValueTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnValueTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UnkStnValueTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UserPrefsRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UserPrefsRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UserPrefsRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UserPrefsRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UserPrefsTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UserPrefsTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UserPrefsTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/UserPrefsTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECactionRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECactionRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECactionRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECactionRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECactionTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECactionTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECactionTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECactionTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECcauseRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECcauseRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECcauseRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECcauseRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECcauseTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECcauseTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECcauseTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECcauseTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECeventRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECeventRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECeventRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECeventRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECeventTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECeventTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECeventTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECeventTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECphenomRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECphenomRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECphenomRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECphenomRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECphenomTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECphenomTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECphenomTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECphenomTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECpracticeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECpracticeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECpracticeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECpracticeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECpracticeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECpracticeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECpracticeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECpracticeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECrecordRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECrecordRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECrecordRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECrecordRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECrecordTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECrecordTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECrecordTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECrecordTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECseverRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECseverRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECseverRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECseverRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECseverTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECseverTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECseverTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECseverTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECsignifRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECsignifRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECsignifRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECsignifRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECsignifTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECsignifTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECsignifTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/VTECsignifTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCoordAgencyRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCoordAgencyRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCoordAgencyRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCoordAgencyRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCoordAgencyTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCoordAgencyTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCoordAgencyTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCoordAgencyTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCriterionRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCriterionRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCriterionRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCriterionRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCriterionTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCriterionTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCriterionTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupCriterionTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupMethodRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupMethodRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupMethodRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupMethodRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupMethodTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupMethodTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupMethodTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupMethodTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupRespAgencyRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupRespAgencyRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupRespAgencyRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupRespAgencyRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupRespAgencyTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupRespAgencyTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupRespAgencyTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WatSupRespAgencyTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WaterQualityRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WaterQualityRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WaterQualityRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WaterQualityRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WaterQualityTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WaterQualityTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WaterQualityTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WaterQualityTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WeatherRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WeatherRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WeatherRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WeatherRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WeatherTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WeatherTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WeatherTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WeatherTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WindRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WindRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WindRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WindRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WindTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WindTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WindTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/WindTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/YUniqueRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/YUniqueRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/YUniqueRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/YUniqueRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/YUniqueTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/YUniqueTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/YUniqueTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/YUniqueTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZoneInfoRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZoneInfoRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZoneInfoRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZoneInfoRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZoneInfoView.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZoneInfoView.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZoneInfoView.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZoneInfoView.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZonenumRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZonenumRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZonenumRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZonenumRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZonenumTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZonenumTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZonenumTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/ZonenumTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhradaptRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhradaptRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhradaptRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhradaptRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhradaptTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhradaptTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhradaptTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhradaptTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhrradarRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhrradarRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhrradarRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhrradarRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhrradarTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhrradarTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhrradarTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dhrradarTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspadaptRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspadaptRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspadaptRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspadaptRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspadaptTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspadaptTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspadaptTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspadaptTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspradarRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspradarRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspradarRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspradarRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspradarTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspradarTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspradarTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/dspradarTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/velocityRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/velocityRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/velocityRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/velocityRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/velocityTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/velocityTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/velocityTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/velocityTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/verifresptypeRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/verifresptypeRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/verifresptypeRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/verifresptypeRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/verifresptypeTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/verifresptypeTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/verifresptypeTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/verifresptypeTable.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/wfoRecord.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/wfoRecord.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/wfoRecord.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/wfoRecord.java diff --git a/nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/wfoTable.java b/javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/wfoTable.java similarity index 100% rename from nativeLib/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/wfoTable.java rename to javaUtilities/hydro/ohd.ihfsdb/src/ohd/hseb/ihfsdb/generated/wfoTable.java diff --git a/nativeLib/ohd.lib/.classpath b/javaUtilities/hydro/ohd.lib/.classpath similarity index 100% rename from nativeLib/ohd.lib/.classpath rename to javaUtilities/hydro/ohd.lib/.classpath diff --git a/nativeLib/ohd.lib/.project b/javaUtilities/hydro/ohd.lib/.project similarity index 100% rename from nativeLib/ohd.lib/.project rename to javaUtilities/hydro/ohd.lib/.project diff --git a/nativeLib/ohd.lib/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.lib/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.lib/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.lib/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.lib/ChartDirector.jar b/javaUtilities/hydro/ohd.lib/ChartDirector.jar similarity index 100% rename from nativeLib/ohd.lib/ChartDirector.jar rename to javaUtilities/hydro/ohd.lib/ChartDirector.jar diff --git a/nativeLib/ohd.lib/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.lib/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.lib/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.lib/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.lib/activation.jar b/javaUtilities/hydro/ohd.lib/activation.jar similarity index 100% rename from nativeLib/ohd.lib/activation.jar rename to javaUtilities/hydro/ohd.lib/activation.jar diff --git a/nativeLib/ohd.lib/bsf.jar b/javaUtilities/hydro/ohd.lib/bsf.jar similarity index 100% rename from nativeLib/ohd.lib/bsf.jar rename to javaUtilities/hydro/ohd.lib/bsf.jar diff --git a/nativeLib/ohd.lib/bsh-2.0b4.jar b/javaUtilities/hydro/ohd.lib/bsh-2.0b4.jar similarity index 100% rename from nativeLib/ohd.lib/bsh-2.0b4.jar rename to javaUtilities/hydro/ohd.lib/bsh-2.0b4.jar diff --git a/nativeLib/ohd.lib/build.properties b/javaUtilities/hydro/ohd.lib/build.properties similarity index 100% rename from nativeLib/ohd.lib/build.properties rename to javaUtilities/hydro/ohd.lib/build.properties diff --git a/nativeLib/ohd.lib/fldat.jar b/javaUtilities/hydro/ohd.lib/fldat.jar similarity index 100% rename from nativeLib/ohd.lib/fldat.jar rename to javaUtilities/hydro/ohd.lib/fldat.jar diff --git a/nativeLib/ohd.lib/jcchart.jar b/javaUtilities/hydro/ohd.lib/jcchart.jar similarity index 100% rename from nativeLib/ohd.lib/jcchart.jar rename to javaUtilities/hydro/ohd.lib/jcchart.jar diff --git a/nativeLib/ohd.lib/jdom.jar b/javaUtilities/hydro/ohd.lib/jdom.jar similarity index 100% rename from nativeLib/ohd.lib/jdom.jar rename to javaUtilities/hydro/ohd.lib/jdom.jar diff --git a/nativeLib/ohd.lib/junit.jar b/javaUtilities/hydro/ohd.lib/junit.jar similarity index 100% rename from nativeLib/ohd.lib/junit.jar rename to javaUtilities/hydro/ohd.lib/junit.jar diff --git a/nativeLib/ohd.lib/mail-1.4.1.jar b/javaUtilities/hydro/ohd.lib/mail-1.4.1.jar similarity index 100% rename from nativeLib/ohd.lib/mail-1.4.1.jar rename to javaUtilities/hydro/ohd.lib/mail-1.4.1.jar diff --git a/nativeLib/ohd.lib/netcdfUI-2.2.22.jar b/javaUtilities/hydro/ohd.lib/netcdfUI-2.2.22.jar similarity index 100% rename from nativeLib/ohd.lib/netcdfUI-2.2.22.jar rename to javaUtilities/hydro/ohd.lib/netcdfUI-2.2.22.jar diff --git a/nativeLib/ohd.lib/nlog4j-1.2.21.jar b/javaUtilities/hydro/ohd.lib/nlog4j-1.2.21.jar similarity index 100% rename from nativeLib/ohd.lib/nlog4j-1.2.21.jar rename to javaUtilities/hydro/ohd.lib/nlog4j-1.2.21.jar diff --git a/nativeLib/ohd.lib/ohd.lib.ecl b/javaUtilities/hydro/ohd.lib/ohd.lib.ecl similarity index 100% rename from nativeLib/ohd.lib/ohd.lib.ecl rename to javaUtilities/hydro/ohd.lib/ohd.lib.ecl diff --git a/nativeLib/ohd.lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3452b.jar b/javaUtilities/hydro/ohd.lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3452b.jar similarity index 100% rename from nativeLib/ohd.lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3452b.jar rename to javaUtilities/hydro/ohd.lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3452b.jar diff --git a/nativeLib/ohd.lib/org.eclipse.swt_3.4.2.v3452b.jar b/javaUtilities/hydro/ohd.lib/org.eclipse.swt_3.4.2.v3452b.jar similarity index 100% rename from nativeLib/ohd.lib/org.eclipse.swt_3.4.2.v3452b.jar rename to javaUtilities/hydro/ohd.lib/org.eclipse.swt_3.4.2.v3452b.jar diff --git a/nativeLib/ohd.lib/postgresql-8.2-506.jdbc3.jar b/javaUtilities/hydro/ohd.lib/postgresql-8.2-506.jdbc3.jar similarity index 100% rename from nativeLib/ohd.lib/postgresql-8.2-506.jdbc3.jar rename to javaUtilities/hydro/ohd.lib/postgresql-8.2-506.jdbc3.jar diff --git a/nativeLib/ohd.lib/rax_apps.jar b/javaUtilities/hydro/ohd.lib/rax_apps.jar similarity index 100% rename from nativeLib/ohd.lib/rax_apps.jar rename to javaUtilities/hydro/ohd.lib/rax_apps.jar diff --git a/nativeLib/ohd.lib/rfc_util.jar b/javaUtilities/hydro/ohd.lib/rfc_util.jar similarity index 100% rename from nativeLib/ohd.lib/rfc_util.jar rename to javaUtilities/hydro/ohd.lib/rfc_util.jar diff --git a/nativeLib/ohd.map/.classpath b/javaUtilities/hydro/ohd.map/.classpath similarity index 100% rename from nativeLib/ohd.map/.classpath rename to javaUtilities/hydro/ohd.map/.classpath diff --git a/nativeLib/ohd.map/.project b/javaUtilities/hydro/ohd.map/.project similarity index 100% rename from nativeLib/ohd.map/.project rename to javaUtilities/hydro/ohd.map/.project diff --git a/nativeLib/ohd.map/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.map/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.map/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.map/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.map/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.map/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.map/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.map/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.map/build.properties b/javaUtilities/hydro/ohd.map/build.properties similarity index 100% rename from nativeLib/ohd.map/build.properties rename to javaUtilities/hydro/ohd.map/build.properties diff --git a/nativeLib/ohd.map/build.xml b/javaUtilities/hydro/ohd.map/build.xml similarity index 100% rename from nativeLib/ohd.map/build.xml rename to javaUtilities/hydro/ohd.map/build.xml diff --git a/nativeLib/ohd.map/ohd.map.ecl b/javaUtilities/hydro/ohd.map/ohd.map.ecl similarity index 100% rename from nativeLib/ohd.map/ohd.map.ecl rename to javaUtilities/hydro/ohd.map/ohd.map.ecl diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/DrawingTools.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/DrawingTools.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/DrawingTools.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/DrawingTools.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/MapCanvas.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/MapCanvas.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/MapCanvas.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/MapCanvas.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/MapDataManager.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/MapDataManager.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/MapDataManager.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/MapDataManager.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/examples/MapFrame.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/examples/MapFrame.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/examples/MapFrame.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/examples/MapFrame.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/examples/PrecipMonitorPointMapLayer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/examples/PrecipMonitorPointMapLayer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/examples/PrecipMonitorPointMapLayer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/examples/PrecipMonitorPointMapLayer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/examples/RiverFcstPointMapLayer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/examples/RiverFcstPointMapLayer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/examples/RiverFcstPointMapLayer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/examples/RiverFcstPointMapLayer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/examples/StationPoint.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/examples/StationPoint.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/examples/StationPoint.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/examples/StationPoint.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/io/BCDFileReader.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/io/BCDFileReader.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/io/BCDFileReader.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/io/BCDFileReader.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/io/BinaryGeoDataFileReader.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/io/BinaryGeoDataFileReader.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/io/BinaryGeoDataFileReader.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/io/BinaryGeoDataFileReader.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/io/ElevationFileReader.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/io/ElevationFileReader.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/io/ElevationFileReader.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/io/ElevationFileReader.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/io/ElevationFileReaderSlow.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/io/ElevationFileReaderSlow.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/io/ElevationFileReaderSlow.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/io/ElevationFileReaderSlow.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/BaseColorDeterminer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/BaseColorDeterminer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/BaseColorDeterminer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/BaseColorDeterminer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/BaseMapLayer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/BaseMapLayer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/BaseMapLayer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/BaseMapLayer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/CenterPointMapLayer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/CenterPointMapLayer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/CenterPointMapLayer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/CenterPointMapLayer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/ColorDeterminer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/ColorDeterminer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/ColorDeterminer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/ColorDeterminer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/ElevationMapLayer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/ElevationMapLayer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/ElevationMapLayer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/ElevationMapLayer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/GriddedMapLayer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/GriddedMapLayer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/GriddedMapLayer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/GriddedMapLayer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/MapLayer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/MapLayer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/MapLayer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/MapLayer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/PolyLineMapLayer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/PolyLineMapLayer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/PolyLineMapLayer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/PolyLineMapLayer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/PolygonMapLayer.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/PolygonMapLayer.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/PolygonMapLayer.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/PolygonMapLayer.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/layer/XmrgGridToGridAdapter.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/XmrgGridToGridAdapter.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/layer/XmrgGridToGridAdapter.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/layer/XmrgGridToGridAdapter.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/test/ContouringTest.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/test/ContouringTest.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/test/ContouringTest.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/test/ContouringTest.java diff --git a/nativeLib/ohd.map/src/ohd/hseb/geomap/test/MockRowColToLatLonTranslator.java b/javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/test/MockRowColToLatLonTranslator.java similarity index 100% rename from nativeLib/ohd.map/src/ohd/hseb/geomap/test/MockRowColToLatLonTranslator.java rename to javaUtilities/hydro/ohd.map/src/ohd/hseb/geomap/test/MockRowColToLatLonTranslator.java diff --git a/nativeLib/ohd.misc_dialogs/.classpath b/javaUtilities/hydro/ohd.misc_dialogs/.classpath similarity index 100% rename from nativeLib/ohd.misc_dialogs/.classpath rename to javaUtilities/hydro/ohd.misc_dialogs/.classpath diff --git a/nativeLib/ohd.misc_dialogs/.project b/javaUtilities/hydro/ohd.misc_dialogs/.project similarity index 100% rename from nativeLib/ohd.misc_dialogs/.project rename to javaUtilities/hydro/ohd.misc_dialogs/.project diff --git a/nativeLib/ohd.misc_dialogs/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.misc_dialogs/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.misc_dialogs/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.misc_dialogs/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.misc_dialogs/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.misc_dialogs/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.misc_dialogs/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.misc_dialogs/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.misc_dialogs/build.properties b/javaUtilities/hydro/ohd.misc_dialogs/build.properties similarity index 100% rename from nativeLib/ohd.misc_dialogs/build.properties rename to javaUtilities/hydro/ohd.misc_dialogs/build.properties diff --git a/nativeLib/ohd.misc_dialogs/build.xml b/javaUtilities/hydro/ohd.misc_dialogs/build.xml similarity index 100% rename from nativeLib/ohd.misc_dialogs/build.xml rename to javaUtilities/hydro/ohd.misc_dialogs/build.xml diff --git a/nativeLib/ohd.misc_dialogs/ohd.misc_dialogs.ecl b/javaUtilities/hydro/ohd.misc_dialogs/ohd.misc_dialogs.ecl similarity index 100% rename from nativeLib/ohd.misc_dialogs/ohd.misc_dialogs.ecl rename to javaUtilities/hydro/ohd.misc_dialogs/ohd.misc_dialogs.ecl diff --git a/nativeLib/ohd.misc_dialogs/scripts/run_ColorChooserDialog b/javaUtilities/hydro/ohd.misc_dialogs/scripts/run_ColorChooserDialog similarity index 100% rename from nativeLib/ohd.misc_dialogs/scripts/run_ColorChooserDialog rename to javaUtilities/hydro/ohd.misc_dialogs/scripts/run_ColorChooserDialog diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorChooserDialog.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorChooserDialog.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorChooserDialog.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorChooserDialog.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorChooserDialogDataMgr.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorChooserDialogDataMgr.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorChooserDialogDataMgr.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorChooserDialogDataMgr.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorHolder.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorHolder.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorHolder.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorHolder.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorPickerDialog.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorPickerDialog.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorPickerDialog.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorPickerDialog.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorScaleValueSet.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorScaleValueSet.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorScaleValueSet.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorScaleValueSet.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorSet.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorSet.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorSet.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorSet.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorValue.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorValue.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorValue.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ColorValue.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/NamedColor.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/NamedColor.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/NamedColor.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/NamedColor.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/NamedColorMatcher.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/NamedColorMatcher.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/NamedColorMatcher.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/NamedColorMatcher.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ScaleValueSet.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ScaleValueSet.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ScaleValueSet.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/color_chooser/ScaleValueSet.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpCurPrevVtec.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpCurPrevVtec.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpCurPrevVtec.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpCurPrevVtec.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfo.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfo.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfo.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfo.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoDataManager.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoDataManager.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoDataManager.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoDataManager.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoFileReader.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoFileReader.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoFileReader.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoFileReader.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoFrame.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoFrame.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoFrame.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/FpVtecInfoFrame.java diff --git a/nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/TimeLineAdjustmentListener.java b/javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/TimeLineAdjustmentListener.java similarity index 100% rename from nativeLib/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/TimeLineAdjustmentListener.java rename to javaUtilities/hydro/ohd.misc_dialogs/src/ohd/hseb/fp_vtec_info/TimeLineAdjustmentListener.java diff --git a/nativeLib/ohd.mpe/.classpath b/javaUtilities/hydro/ohd.mpe/.classpath similarity index 100% rename from nativeLib/ohd.mpe/.classpath rename to javaUtilities/hydro/ohd.mpe/.classpath diff --git a/nativeLib/ohd.mpe/.project b/javaUtilities/hydro/ohd.mpe/.project similarity index 100% rename from nativeLib/ohd.mpe/.project rename to javaUtilities/hydro/ohd.mpe/.project diff --git a/nativeLib/ohd.mpe/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.mpe/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.mpe/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.mpe/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.mpe/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.mpe/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.mpe/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.mpe/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.mpe/build.properties b/javaUtilities/hydro/ohd.mpe/build.properties similarity index 100% rename from nativeLib/ohd.mpe/build.properties rename to javaUtilities/hydro/ohd.mpe/build.properties diff --git a/nativeLib/ohd.mpe/build.xml b/javaUtilities/hydro/ohd.mpe/build.xml similarity index 100% rename from nativeLib/ohd.mpe/build.xml rename to javaUtilities/hydro/ohd.mpe/build.xml diff --git a/nativeLib/ohd.mpe/ohd.mpe.ecl b/javaUtilities/hydro/ohd.mpe/ohd.mpe.ecl similarity index 100% rename from nativeLib/ohd.mpe/ohd.mpe.ecl rename to javaUtilities/hydro/ohd.mpe/ohd.mpe.ecl diff --git a/nativeLib/ohd.mpe/src/ohd/hseb/mpe/util/MPEProductDescriptor.java b/javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/util/MPEProductDescriptor.java similarity index 100% rename from nativeLib/ohd.mpe/src/ohd/hseb/mpe/util/MPEProductDescriptor.java rename to javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/util/MPEProductDescriptor.java diff --git a/nativeLib/ohd.mpe/src/ohd/hseb/mpe/window/GageTableCellEditor.java b/javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/window/GageTableCellEditor.java similarity index 100% rename from nativeLib/ohd.mpe/src/ohd/hseb/mpe/window/GageTableCellEditor.java rename to javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/window/GageTableCellEditor.java diff --git a/nativeLib/ohd.mpe/src/ohd/hseb/mpe/window/GageTableDataManager.java b/javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/window/GageTableDataManager.java similarity index 100% rename from nativeLib/ohd.mpe/src/ohd/hseb/mpe/window/GageTableDataManager.java rename to javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/window/GageTableDataManager.java diff --git a/nativeLib/ohd.mpe/src/ohd/hseb/mpe/window/GageTableFrame.java b/javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/window/GageTableFrame.java similarity index 100% rename from nativeLib/ohd.mpe/src/ohd/hseb/mpe/window/GageTableFrame.java rename to javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/window/GageTableFrame.java diff --git a/nativeLib/ohd.mpe/src/ohd/hseb/mpe/window/GageTableRowData.java b/javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/window/GageTableRowData.java similarity index 100% rename from nativeLib/ohd.mpe/src/ohd/hseb/mpe/window/GageTableRowData.java rename to javaUtilities/hydro/ohd.mpe/src/ohd/hseb/mpe/window/GageTableRowData.java diff --git a/nativeLib/ohd.pdc_pp/.classpath b/javaUtilities/hydro/ohd.pdc_pp/.classpath similarity index 100% rename from nativeLib/ohd.pdc_pp/.classpath rename to javaUtilities/hydro/ohd.pdc_pp/.classpath diff --git a/nativeLib/ohd.pdc_pp/.project b/javaUtilities/hydro/ohd.pdc_pp/.project similarity index 100% rename from nativeLib/ohd.pdc_pp/.project rename to javaUtilities/hydro/ohd.pdc_pp/.project diff --git a/nativeLib/ohd.pdc_pp/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.pdc_pp/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.pdc_pp/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.pdc_pp/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.pdc_pp/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.pdc_pp/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.pdc_pp/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.pdc_pp/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.pdc_pp/build.properties b/javaUtilities/hydro/ohd.pdc_pp/build.properties similarity index 100% rename from nativeLib/ohd.pdc_pp/build.properties rename to javaUtilities/hydro/ohd.pdc_pp/build.properties diff --git a/nativeLib/ohd.pdc_pp/build.xml b/javaUtilities/hydro/ohd.pdc_pp/build.xml similarity index 100% rename from nativeLib/ohd.pdc_pp/build.xml rename to javaUtilities/hydro/ohd.pdc_pp/build.xml diff --git a/nativeLib/ohd.pdc_pp/ohd.pdc_pp.ecl b/javaUtilities/hydro/ohd.pdc_pp/ohd.pdc_pp.ecl similarity index 100% rename from nativeLib/ohd.pdc_pp/ohd.pdc_pp.ecl rename to javaUtilities/hydro/ohd.pdc_pp/ohd.pdc_pp.ecl diff --git a/nativeLib/ohd.pdc_pp/scripts/pdc_pp_test b/javaUtilities/hydro/ohd.pdc_pp/scripts/pdc_pp_test similarity index 100% rename from nativeLib/ohd.pdc_pp/scripts/pdc_pp_test rename to javaUtilities/hydro/ohd.pdc_pp/scripts/pdc_pp_test diff --git a/nativeLib/ohd.pdc_pp/scripts/run_pdc_pp b/javaUtilities/hydro/ohd.pdc_pp/scripts/run_pdc_pp similarity index 100% rename from nativeLib/ohd.pdc_pp/scripts/run_pdc_pp rename to javaUtilities/hydro/ohd.pdc_pp/scripts/run_pdc_pp diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/DailyTimeSlotPolicy.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/DailyTimeSlotPolicy.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/DailyTimeSlotPolicy.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/DailyTimeSlotPolicy.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/HourlyTimeSlotPolicy.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/HourlyTimeSlotPolicy.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/HourlyTimeSlotPolicy.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/HourlyTimeSlotPolicy.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/IrregularObsTimeSeries.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/IrregularObsTimeSeries.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/IrregularObsTimeSeries.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/IrregularObsTimeSeries.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/Location.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/Location.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/Location.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/Location.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/NonPrecipObsTableManager.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/NonPrecipObsTableManager.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/NonPrecipObsTableManager.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/NonPrecipObsTableManager.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileReader.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileReader.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileReader.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileReader.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileReaderSlow.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileReaderSlow.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileReaderSlow.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileReaderSlow.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileWriter.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileWriter.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileWriter.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCFileWriter.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCPreprocessor.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCPreprocessor.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCPreprocessor.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCPreprocessor.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCPreprocessorDataMgr.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCPreprocessorDataMgr.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCPreprocessorDataMgr.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PDCPreprocessorDataMgr.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PdcMergeTest.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PdcMergeTest.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PdcMergeTest.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PdcMergeTest.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PdcReadTest.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PdcReadTest.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PdcReadTest.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PdcReadTest.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PrecipListHolder.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PrecipListHolder.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PrecipListHolder.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/PrecipListHolder.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeries.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeries.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeries.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeries.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesComparator.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesComparator.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesComparator.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesComparator.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesComparator.java.new b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesComparator.java.new similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesComparator.java.new rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesComparator.java.new diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesDescriptor.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesDescriptor.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesDescriptor.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/RegularObsTimeSeriesDescriptor.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeSeriesListMgr.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeSeriesListMgr.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeSeriesListMgr.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeSeriesListMgr.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeSlotPolicy.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeSlotPolicy.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeSlotPolicy.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeSlotPolicy.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeValuePair.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeValuePair.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeValuePair.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/TimeValuePair.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/sample_data_set/CreateSampleDataSet.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/sample_data_set/CreateSampleDataSet.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/sample_data_set/CreateSampleDataSet.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/sample_data_set/CreateSampleDataSet.java diff --git a/nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/sample_data_set/SampleDataSetCreatorDataMgr.java b/javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/sample_data_set/SampleDataSetCreatorDataMgr.java similarity index 100% rename from nativeLib/ohd.pdc_pp/src/ohd/hseb/pdc_pp/sample_data_set/SampleDataSetCreatorDataMgr.java rename to javaUtilities/hydro/ohd.pdc_pp/src/ohd/hseb/pdc_pp/sample_data_set/SampleDataSetCreatorDataMgr.java diff --git a/nativeLib/ohd.prism/.classpath b/javaUtilities/hydro/ohd.prism/.classpath similarity index 100% rename from nativeLib/ohd.prism/.classpath rename to javaUtilities/hydro/ohd.prism/.classpath diff --git a/nativeLib/ohd.prism/.project b/javaUtilities/hydro/ohd.prism/.project similarity index 100% rename from nativeLib/ohd.prism/.project rename to javaUtilities/hydro/ohd.prism/.project diff --git a/nativeLib/ohd.prism/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.prism/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.prism/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.prism/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.prism/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.prism/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.prism/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.prism/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.prism/build.properties b/javaUtilities/hydro/ohd.prism/build.properties similarity index 100% rename from nativeLib/ohd.prism/build.properties rename to javaUtilities/hydro/ohd.prism/build.properties diff --git a/nativeLib/ohd.prism/build.xml b/javaUtilities/hydro/ohd.prism/build.xml similarity index 100% rename from nativeLib/ohd.prism/build.xml rename to javaUtilities/hydro/ohd.prism/build.xml diff --git a/nativeLib/ohd.prism/ohd.prism.ecl b/javaUtilities/hydro/ohd.prism/ohd.prism.ecl similarity index 100% rename from nativeLib/ohd.prism/ohd.prism.ecl rename to javaUtilities/hydro/ohd.prism/ohd.prism.ecl diff --git a/nativeLib/ohd.prism/scripts/run_create_prism b/javaUtilities/hydro/ohd.prism/scripts/run_create_prism similarity index 100% rename from nativeLib/ohd.prism/scripts/run_create_prism rename to javaUtilities/hydro/ohd.prism/scripts/run_create_prism diff --git a/nativeLib/ohd.prism/src/ohd/hseb/prism/Converter.java b/javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/Converter.java similarity index 100% rename from nativeLib/ohd.prism/src/ohd/hseb/prism/Converter.java rename to javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/Converter.java diff --git a/nativeLib/ohd.prism/src/ohd/hseb/prism/GeoData.java b/javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/GeoData.java similarity index 100% rename from nativeLib/ohd.prism/src/ohd/hseb/prism/GeoData.java rename to javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/GeoData.java diff --git a/nativeLib/ohd.prism/src/ohd/hseb/prism/MPEClimo.java b/javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/MPEClimo.java similarity index 100% rename from nativeLib/ohd.prism/src/ohd/hseb/prism/MPEClimo.java rename to javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/MPEClimo.java diff --git a/nativeLib/ohd.prism/src/ohd/hseb/prism/MPEConstants.java b/javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/MPEConstants.java similarity index 100% rename from nativeLib/ohd.prism/src/ohd/hseb/prism/MPEConstants.java rename to javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/MPEConstants.java diff --git a/nativeLib/ohd.prism/src/ohd/hseb/prism/Prism.java b/javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/Prism.java similarity index 100% rename from nativeLib/ohd.prism/src/ohd/hseb/prism/Prism.java rename to javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/Prism.java diff --git a/nativeLib/ohd.prism/src/ohd/hseb/prism/XMRG.java b/javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/XMRG.java similarity index 100% rename from nativeLib/ohd.prism/src/ohd/hseb/prism/XMRG.java rename to javaUtilities/hydro/ohd.prism/src/ohd/hseb/prism/XMRG.java diff --git a/nativeLib/ohd.rax_apps/.classpath b/javaUtilities/hydro/ohd.rax_apps/.classpath similarity index 100% rename from nativeLib/ohd.rax_apps/.classpath rename to javaUtilities/hydro/ohd.rax_apps/.classpath diff --git a/nativeLib/ohd.rax_apps/.project b/javaUtilities/hydro/ohd.rax_apps/.project similarity index 100% rename from nativeLib/ohd.rax_apps/.project rename to javaUtilities/hydro/ohd.rax_apps/.project diff --git a/nativeLib/ohd.rax_apps/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.rax_apps/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.rax_apps/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.rax_apps/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.rax_apps/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.rax_apps/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.rax_apps/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.rax_apps/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.rax_apps/build.properties b/javaUtilities/hydro/ohd.rax_apps/build.properties similarity index 100% rename from nativeLib/ohd.rax_apps/build.properties rename to javaUtilities/hydro/ohd.rax_apps/build.properties diff --git a/nativeLib/ohd.rax_apps/build.xml b/javaUtilities/hydro/ohd.rax_apps/build.xml similarity index 100% rename from nativeLib/ohd.rax_apps/build.xml rename to javaUtilities/hydro/ohd.rax_apps/build.xml diff --git a/nativeLib/ohd.rax_apps/ohd.rax_apps.ecl b/javaUtilities/hydro/ohd.rax_apps/ohd.rax_apps.ecl similarity index 100% rename from nativeLib/ohd.rax_apps/ohd.rax_apps.ecl rename to javaUtilities/hydro/ohd.rax_apps/ohd.rax_apps.ecl diff --git a/nativeLib/ohd.rax_apps/scripts/run_raxdb_sync b/javaUtilities/hydro/ohd.rax_apps/scripts/run_raxdb_sync similarity index 100% rename from nativeLib/ohd.rax_apps/scripts/run_raxdb_sync rename to javaUtilities/hydro/ohd.rax_apps/scripts/run_raxdb_sync diff --git a/nativeLib/ohd.rax_apps/scripts/start_raxbase b/javaUtilities/hydro/ohd.rax_apps/scripts/start_raxbase similarity index 100% rename from nativeLib/ohd.rax_apps/scripts/start_raxbase rename to javaUtilities/hydro/ohd.rax_apps/scripts/start_raxbase diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/RaxBase.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/RaxBase.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/RaxBase.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/RaxBase.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/RaxBaseDataMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/RaxBaseDataMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/RaxBaseDataMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/RaxBaseDataMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/db/CustomRaxRatingTable.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/db/CustomRaxRatingTable.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/db/CustomRaxRatingTable.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/db/CustomRaxRatingTable.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AdjustFactorEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AdjustFactorEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AdjustFactorEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AdjustFactorEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AgencyEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AgencyEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AgencyEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AgencyEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AverageEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AverageEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AverageEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/AverageEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CountiesEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CountiesEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CountiesEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CountiesEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CountryEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CountryEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CountryEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CountryEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CrestEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CrestEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CrestEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/CrestEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/DataLimitsEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/DataLimitsEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/DataLimitsEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/DataLimitsEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc2Editor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc2Editor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc2Editor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc2Editor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc4Editor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc4Editor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc4Editor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc4Editor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc6Editor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc6Editor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc6Editor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc6Editor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc8Editor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc8Editor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc8Editor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/Huc8Editor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/IngestFilterEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/IngestFilterEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/IngestFilterEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/IngestFilterEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/LocationEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/LocationEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/LocationEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/LocationEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ModCtrlEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ModCtrlEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ModCtrlEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ModCtrlEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessAdjustFactorDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessAdjustFactorDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessAdjustFactorDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessAdjustFactorDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessCrestDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessCrestDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessCrestDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessCrestDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessDataLimitsDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessDataLimitsDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessDataLimitsDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessDataLimitsDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessIngestFilterDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessIngestFilterDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessIngestFilterDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessIngestFilterDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessLocDataLimitsDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessLocDataLimitsDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessLocDataLimitsDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessLocDataLimitsDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessLocationDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessLocationDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessLocationDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessLocationDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessRatingDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessRatingDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessRatingDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessRatingDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessReservoirDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessReservoirDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessReservoirDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessReservoirDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessRiverCritDifferencesDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessRiverCritDifferencesDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessRiverCritDifferencesDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProcessRiverCritDifferencesDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProdEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProdEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProdEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ProdEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RatingCurveEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RatingCurveEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RatingCurveEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RatingCurveEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ReservoirEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ReservoirEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ReservoirEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ReservoirEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RfcEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RfcEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RfcEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RfcEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RiverCritEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RiverCritEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RiverCritEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/RiverCritEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/SensOKEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/SensOKEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/SensOKEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/SensOKEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefDurationEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefDurationEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefDurationEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefDurationEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefExtremumEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefExtremumEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefExtremumEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefExtremumEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPE1Editor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPE1Editor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPE1Editor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPE1Editor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPEEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPEEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPEEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPEEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPETransEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPETransEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPETransEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefPETransEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefProbEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefProbEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefProbEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefProbEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefQCEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefQCEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefQCEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefQCEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefTSEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefTSEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefTSEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/ShefTSEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/SlopeProfileEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/SlopeProfileEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/SlopeProfileEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/SlopeProfileEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/StateEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/StateEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/StateEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/StateEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/StatusBar.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/StatusBar.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/StatusBar.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/StatusBar.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/WfoHsaEditor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/WfoHsaEditor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/gui/WfoHsaEditor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/gui/WfoHsaEditor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Agency.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Agency.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Agency.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Agency.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Average.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Average.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Average.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Average.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Counties.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Counties.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Counties.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Counties.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Country.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Country.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Country.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Country.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc2.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc2.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc2.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc2.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc4.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc4.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc4.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc4.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc6.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc6.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc6.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc6.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc8.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc8.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc8.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Huc8.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ModCtrl.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ModCtrl.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ModCtrl.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ModCtrl.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Prod.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Prod.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Prod.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Prod.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxAdjustFactor.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxAdjustFactor.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxAdjustFactor.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxAdjustFactor.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxCrest.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxCrest.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxCrest.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxCrest.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxDataLimits.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxDataLimits.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxDataLimits.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxDataLimits.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxIngestFilter.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxIngestFilter.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxIngestFilter.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxIngestFilter.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxLocDataLimits.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxLocDataLimits.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxLocDataLimits.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxLocDataLimits.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxLocation.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxLocation.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxLocation.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxLocation.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRating.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRating.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRating.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRating.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingOffset.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingOffset.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingOffset.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingOffset.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingPoint.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingPoint.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingPoint.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingPoint.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingShift.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingShift.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingShift.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRatingShift.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxReservoir.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxReservoir.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxReservoir.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxReservoir.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRiverCrit.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRiverCrit.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRiverCrit.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/RaxRiverCrit.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Rfc.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Rfc.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Rfc.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Rfc.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Sensok.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Sensok.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/Sensok.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/Sensok.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefDuration.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefDuration.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefDuration.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefDuration.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefExtremum.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefExtremum.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefExtremum.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefExtremum.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPE.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPE.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPE.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPE.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPE1.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPE1.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPE1.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPE1.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPETrans.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPETrans.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPETrans.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefPETrans.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefProb.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefProb.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefProb.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefProb.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefQC.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefQC.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefQC.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefQC.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefTS.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefTS.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefTS.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/ShefTS.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/SlopeProfile.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/SlopeProfile.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/SlopeProfile.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/SlopeProfile.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/State.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/State.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/State.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/State.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/WfoHsa.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/WfoHsa.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/model/WfoHsa.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/model/WfoHsa.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseAdjustFactorJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseAdjustFactorJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseAdjustFactorJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseAdjustFactorJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseAgencyJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseAgencyJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseAgencyJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseAgencyJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCountiesJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCountiesJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCountiesJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCountiesJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCountryJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCountryJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCountryJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCountryJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCrestJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCrestJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCrestJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseCrestJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseDataLimitsJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseDataLimitsJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseDataLimitsJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseDataLimitsJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc2JTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc2JTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc2JTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc2JTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc4JTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc4JTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc4JTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc4JTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc6JTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc6JTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc6JTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc6JTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc8JTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc8JTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc8JTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseHuc8JTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseIngestFilterJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseIngestFilterJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseIngestFilterJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseIngestFilterJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseLocationJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseLocationJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseLocationJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseLocationJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseModCtrlJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseModCtrlJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseModCtrlJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseModCtrlJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseProdJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseProdJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseProdJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseProdJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRatingJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRatingJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRatingJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRatingJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRatingOffsetsJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRatingOffsetsJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRatingOffsetsJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRatingOffsetsJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRfcJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRfcJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRfcJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseRfcJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefDurationJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefDurationJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefDurationJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefDurationJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefExtremumJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefExtremumJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefExtremumJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefExtremumJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPE1JTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPE1JTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPE1JTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPE1JTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPEJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPEJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPEJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPEJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPETransJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPETransJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPETransJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefPETransJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefProbJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefProbJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefProbJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefProbJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefQCJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefQCJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefQCJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefQCJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefTSJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefTSJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefTSJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseShefTSJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseStateJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseStateJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseStateJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseStateJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseWfoHsaJTableRowData.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseWfoHsaJTableRowData.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseWfoHsaJTableRowData.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/table/ArcBaseWfoHsaJTableRowData.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/CursorController.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/CursorController.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/CursorController.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/CursorController.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/DateManager.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/DateManager.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/DateManager.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/DateManager.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/HDateSuperChooser.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/HDateSuperChooser.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/HDateSuperChooser.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/HDateSuperChooser.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/JListPanelSuperCellRenderer.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/JListPanelSuperCellRenderer.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/JListPanelSuperCellRenderer.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/JListPanelSuperCellRenderer.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/ModalDialogRunner.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/ModalDialogRunner.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/ModalDialogRunner.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/ModalDialogRunner.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/PEDTSEPManager.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/PEDTSEPManager.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/PEDTSEPManager.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/PEDTSEPManager.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/PEManager.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/PEManager.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/PEManager.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/PEManager.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/RaxRatingShiftCalculator.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/RaxRatingShiftCalculator.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/RaxRatingShiftCalculator.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/RaxRatingShiftCalculator.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/ShiftedStage.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/ShiftedStage.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/ShiftedStage.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/ShiftedStage.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/StatusDialog.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/StatusDialog.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/StatusDialog.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/StatusDialog.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/StringPadder.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/StringPadder.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/StringPadder.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/StringPadder.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/TSManager.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/TSManager.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxbase/util/TSManager.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxbase/util/TSManager.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/AdjustFactorDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/AdjustFactorDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/AdjustFactorDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/AdjustFactorDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/BaseDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/BaseDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/BaseDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/BaseDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/CrestDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/CrestDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/CrestDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/CrestDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/DataLimitsDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/DataLimitsDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/DataLimitsDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/DataLimitsDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/DiffSet.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/DiffSet.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/DiffSet.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/DiffSet.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/FieldDifference.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/FieldDifference.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/FieldDifference.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/FieldDifference.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/IDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/IDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/IDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/IDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/IngestFilterDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/IngestFilterDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/IngestFilterDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/IngestFilterDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/LocDataLimitsDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/LocDataLimitsDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/LocDataLimitsDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/LocDataLimitsDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/LocationDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/LocationDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/LocationDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/LocationDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingCurveHolder.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingCurveHolder.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingCurveHolder.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingCurveHolder.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingShiftDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingShiftDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingShiftDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RatingShiftDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxDbSync.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxDbSync.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxDbSync.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxDbSync.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxDbSyncBatch.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxDbSyncBatch.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxDbSyncBatch.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxDbSyncBatch.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxSyncDataMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxSyncDataMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxSyncDataMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxSyncDataMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxSyncFileMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxSyncFileMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxSyncFileMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RaxSyncFileMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RecordDifference.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RecordDifference.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RecordDifference.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RecordDifference.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RecordDifferenceOriginType.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RecordDifferenceOriginType.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RecordDifferenceOriginType.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RecordDifferenceOriginType.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/ReservoirDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/ReservoirDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/ReservoirDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/ReservoirDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RiverCritDifferenceMgr.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RiverCritDifferenceMgr.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RiverCritDifferenceMgr.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RiverCritDifferenceMgr.java diff --git a/nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RiverCritHolder.java b/javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RiverCritHolder.java similarity index 100% rename from nativeLib/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RiverCritHolder.java rename to javaUtilities/hydro/ohd.rax_apps/src/ohd/hseb/raxdb_sync/RiverCritHolder.java diff --git a/nativeLib/ohd.raxdb/.classpath b/javaUtilities/hydro/ohd.raxdb/.classpath similarity index 100% rename from nativeLib/ohd.raxdb/.classpath rename to javaUtilities/hydro/ohd.raxdb/.classpath diff --git a/nativeLib/ohd.raxdb/.project b/javaUtilities/hydro/ohd.raxdb/.project similarity index 100% rename from nativeLib/ohd.raxdb/.project rename to javaUtilities/hydro/ohd.raxdb/.project diff --git a/nativeLib/ohd.raxdb/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.raxdb/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.raxdb/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.raxdb/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.raxdb/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.raxdb/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.raxdb/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.raxdb/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.raxdb/build.properties b/javaUtilities/hydro/ohd.raxdb/build.properties similarity index 100% rename from nativeLib/ohd.raxdb/build.properties rename to javaUtilities/hydro/ohd.raxdb/build.properties diff --git a/nativeLib/ohd.raxdb/build.xml b/javaUtilities/hydro/ohd.raxdb/build.xml similarity index 100% rename from nativeLib/ohd.raxdb/build.xml rename to javaUtilities/hydro/ohd.raxdb/build.xml diff --git a/nativeLib/ohd.raxdb/ohd.raxdb.ecl b/javaUtilities/hydro/ohd.raxdb/ohd.raxdb.ecl similarity index 100% rename from nativeLib/ohd.raxdb/ohd.raxdb.ecl rename to javaUtilities/hydro/ohd.raxdb/ohd.raxdb.ecl diff --git a/nativeLib/ohd.raxdb/scripts/CustomPreferredTableNames.txt b/javaUtilities/hydro/ohd.raxdb/scripts/CustomPreferredTableNames.txt similarity index 100% rename from nativeLib/ohd.raxdb/scripts/CustomPreferredTableNames.txt rename to javaUtilities/hydro/ohd.raxdb/scripts/CustomPreferredTableNames.txt diff --git a/nativeLib/ohd.raxdb/scripts/PreferredTableNames.txt b/javaUtilities/hydro/ohd.raxdb/scripts/PreferredTableNames.txt similarity index 100% rename from nativeLib/ohd.raxdb/scripts/PreferredTableNames.txt rename to javaUtilities/hydro/ohd.raxdb/scripts/PreferredTableNames.txt diff --git a/nativeLib/ohd.raxdb/scripts/PreferredTableNames.txt.temp b/javaUtilities/hydro/ohd.raxdb/scripts/PreferredTableNames.txt.temp similarity index 100% rename from nativeLib/ohd.raxdb/scripts/PreferredTableNames.txt.temp rename to javaUtilities/hydro/ohd.raxdb/scripts/PreferredTableNames.txt.temp diff --git a/nativeLib/ohd.raxdb/scripts/create_table_names_file b/javaUtilities/hydro/ohd.raxdb/scripts/create_table_names_file similarity index 100% rename from nativeLib/ohd.raxdb/scripts/create_table_names_file rename to javaUtilities/hydro/ohd.raxdb/scripts/create_table_names_file diff --git a/nativeLib/ohd.raxdb/scripts/run_raxdb_jdbgen b/javaUtilities/hydro/ohd.raxdb/scripts/run_raxdb_jdbgen similarity index 100% rename from nativeLib/ohd.raxdb/scripts/run_raxdb_jdbgen rename to javaUtilities/hydro/ohd.raxdb/scripts/run_raxdb_jdbgen diff --git a/nativeLib/ohd.rivermonitor/.classpath b/javaUtilities/hydro/ohd.rivermonitor/.classpath similarity index 100% rename from nativeLib/ohd.rivermonitor/.classpath rename to javaUtilities/hydro/ohd.rivermonitor/.classpath diff --git a/nativeLib/ohd.rivermonitor/.project b/javaUtilities/hydro/ohd.rivermonitor/.project similarity index 100% rename from nativeLib/ohd.rivermonitor/.project rename to javaUtilities/hydro/ohd.rivermonitor/.project diff --git a/nativeLib/ohd.rivermonitor/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.rivermonitor/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.rivermonitor/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.rivermonitor/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.rivermonitor/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.rivermonitor/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.rivermonitor/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.rivermonitor/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.rivermonitor/build.properties b/javaUtilities/hydro/ohd.rivermonitor/build.properties similarity index 100% rename from nativeLib/ohd.rivermonitor/build.properties rename to javaUtilities/hydro/ohd.rivermonitor/build.properties diff --git a/nativeLib/ohd.rivermonitor/build.xml b/javaUtilities/hydro/ohd.rivermonitor/build.xml similarity index 100% rename from nativeLib/ohd.rivermonitor/build.xml rename to javaUtilities/hydro/ohd.rivermonitor/build.xml diff --git a/nativeLib/ohd.rivermonitor/ohd.rivermonitor.ecl b/javaUtilities/hydro/ohd.rivermonitor/ohd.rivermonitor.ecl similarity index 100% rename from nativeLib/ohd.rivermonitor/ohd.rivermonitor.ecl rename to javaUtilities/hydro/ohd.rivermonitor/ohd.rivermonitor.ecl diff --git a/nativeLib/ohd.rivermonitor/scripts/init_rivermon_tables.ksh b/javaUtilities/hydro/ohd.rivermonitor/scripts/init_rivermon_tables.ksh similarity index 100% rename from nativeLib/ohd.rivermonitor/scripts/init_rivermon_tables.ksh rename to javaUtilities/hydro/ohd.rivermonitor/scripts/init_rivermon_tables.ksh diff --git a/nativeLib/ohd.rivermonitor/scripts/start_rivermonitor b/javaUtilities/hydro/ohd.rivermonitor/scripts/start_rivermonitor similarity index 100% rename from nativeLib/ohd.rivermonitor/scripts/start_rivermonitor rename to javaUtilities/hydro/ohd.rivermonitor/scripts/start_rivermonitor diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmColumns.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmColumns.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmColumns.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmColumns.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmDataManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmDataManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmDataManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmDataManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmDialog.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmDialog.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmDialog.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmDialog.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmJTableRowData.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmJTableRowData.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmJTableRowData.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/alertalarm/AlertAlarmJTableRowData.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/DataFilter.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/DataFilter.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/DataFilter.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/DataFilter.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/LocationDataFilter.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/LocationDataFilter.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/LocationDataFilter.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/LocationDataFilter.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/LocationInfoColumns.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/LocationInfoColumns.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/LocationInfoColumns.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/LocationInfoColumns.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/Monitor.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/Monitor.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/Monitor.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/Monitor.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorCell.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorCell.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorCell.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorCell.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorFrame.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorFrame.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorFrame.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorFrame.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorMessage.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorMessage.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorMessage.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorMessage.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorSplitPane.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorSplitPane.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorSplitPane.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorSplitPane.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorTimeSeriesLiteManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorTimeSeriesLiteManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorTimeSeriesLiteManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorTimeSeriesLiteManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorToolBarManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorToolBarManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorToolBarManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/MonitorToolBarManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/ThreatLevel.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/ThreatLevel.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/ThreatLevel.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/ThreatLevel.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/TreeDataManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/TreeDataManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/TreeDataManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/TreeDataManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/TreeFilterManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/TreeFilterManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/TreeFilterManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/TreeFilterManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/derivedcolumns/DerivedColumn.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/derivedcolumns/DerivedColumn.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/derivedcolumns/DerivedColumn.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/derivedcolumns/DerivedColumn.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/derivedcolumns/DerivedColumnsFileManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/derivedcolumns/DerivedColumnsFileManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/derivedcolumns/DerivedColumnsFileManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/derivedcolumns/DerivedColumnsFileManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/BaseManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/BaseManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/BaseManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/BaseManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/Manager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/Manager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/Manager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/Manager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/MonitorMenuManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/MonitorMenuManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/MonitorMenuManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/MonitorMenuManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/MonitorRefreshManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/MonitorRefreshManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/MonitorRefreshManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/MonitorRefreshManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/Receiver.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/Receiver.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/manager/Receiver.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/manager/Receiver.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/Message.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/Message.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/Message.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/Message.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/MessageSystemManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/MessageSystemManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/MessageSystemManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/MessageSystemManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/MessageType.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/MessageType.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/MessageType.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/messaging/MessageType.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipColumns.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipColumns.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipColumns.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipColumns.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipData.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipData.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipData.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipData.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipDataManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipDataManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipDataManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipDataManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipLocationDataFilter.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipLocationDataFilter.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipLocationDataFilter.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipLocationDataFilter.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipMonitorDataManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipMonitorDataManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipMonitorDataManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipMonitorDataManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipMonitorJTableRowData.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipMonitorJTableRowData.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipMonitorJTableRowData.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipMonitorJTableRowData.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipThresholdDialog.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipThresholdDialog.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipThresholdDialog.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/PrecipThresholdDialog.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorAppManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorAppManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorAppManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorAppManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorFilterManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorFilterManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorFilterManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorFilterManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorMenuManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorMenuManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorMenuManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorMenuManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorRefreshManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorRefreshManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorRefreshManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorRefreshManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorSettingsManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorSettingsManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorSettingsManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorSettingsManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorViewManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorViewManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorViewManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/manager/PrecipMonitorViewManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipColumnDataSettings.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipColumnDataSettings.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipColumnDataSettings.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipColumnDataSettings.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipMonitorMenuSettings.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipMonitorMenuSettings.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipMonitorMenuSettings.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipMonitorMenuSettings.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipMonitorSettingsFileManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipMonitorSettingsFileManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipMonitorSettingsFileManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/precip/settings/PrecipMonitorSettingsFileManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/LookBackTimeDialog.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/LookBackTimeDialog.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/LookBackTimeDialog.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/LookBackTimeDialog.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverColumns.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverColumns.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverColumns.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverColumns.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverLocationDataFilter.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverLocationDataFilter.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverLocationDataFilter.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverLocationDataFilter.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorDataManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorDataManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorDataManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorDataManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorJTableRowData.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorJTableRowData.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorJTableRowData.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorJTableRowData.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorVtecEventDataManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorVtecEventDataManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorVtecEventDataManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/RiverMonitorVtecEventDataManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorAppManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorAppManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorAppManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorAppManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorFilterManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorFilterManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorFilterManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorFilterManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorMenuManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorMenuManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorMenuManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorMenuManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorRefreshManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorRefreshManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorRefreshManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorRefreshManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorSettingsManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorSettingsManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorSettingsManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorSettingsManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorViewManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorViewManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorViewManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/manager/RiverMonitorViewManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverColumnDataSettings.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverColumnDataSettings.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverColumnDataSettings.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverColumnDataSettings.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverMonitorMenuSettings.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverMonitorMenuSettings.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverMonitorMenuSettings.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverMonitorMenuSettings.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverMonitorSettingsFileManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverMonitorSettingsFileManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverMonitorSettingsFileManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/river/settings/RiverMonitorSettingsFileManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/settings/FilterSettings.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/settings/FilterSettings.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/settings/FilterSettings.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/settings/FilterSettings.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/settings/MonitorSettingsFileManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/settings/MonitorSettingsFileManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/settings/MonitorSettingsFileManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/settings/MonitorSettingsFileManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/settings/ViewSettings.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/settings/ViewSettings.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/settings/ViewSettings.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/settings/ViewSettings.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeCellRenderer.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeCellRenderer.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeCellRenderer.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeCellRenderer.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeSelectionModel.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeSelectionModel.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeSelectionModel.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/treefilter/MonitorCheckTreeSelectionModel.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/util/HydroappsDefaultDirs.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/util/HydroappsDefaultDirs.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/monitor/util/HydroappsDefaultDirs.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/monitor/util/HydroappsDefaultDirs.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesColumns.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesColumns.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesColumns.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesColumns.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesDataManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesDataManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesDataManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesDataManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesDialog.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesDialog.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesDialog.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesDialog.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesJTableRowData.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesJTableRowData.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesJTableRowData.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/officenotes/OfficeNotesJTableRowData.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupColumns.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupColumns.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupColumns.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupColumns.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupDialog.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupDialog.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupDialog.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupDialog.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupJTableRowData.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupJTableRowData.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupJTableRowData.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonGroupJTableRowData.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocGroupDataManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocGroupDataManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocGroupDataManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocGroupDataManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationColumns.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationColumns.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationColumns.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationColumns.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationDialog.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationDialog.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationDialog.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationDialog.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationJTableRowData.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationJTableRowData.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationJTableRowData.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/rivermonlocgroup/RiverMonLocationJTableRowData.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventColumns.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventColumns.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventColumns.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventColumns.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventDataManager.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventDataManager.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventDataManager.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventDataManager.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventDialog.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventDialog.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventDialog.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecEventDialog.java diff --git a/nativeLib/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecJTableRowData.java b/javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecJTableRowData.java similarity index 100% rename from nativeLib/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecJTableRowData.java rename to javaUtilities/hydro/ohd.rivermonitor/src/ohd/hseb/vtecevent/VtecJTableRowData.java diff --git a/nativeLib/ohd.sshp/.classpath b/javaUtilities/hydro/ohd.sshp/.classpath similarity index 100% rename from nativeLib/ohd.sshp/.classpath rename to javaUtilities/hydro/ohd.sshp/.classpath diff --git a/nativeLib/ohd.sshp/.project b/javaUtilities/hydro/ohd.sshp/.project similarity index 100% rename from nativeLib/ohd.sshp/.project rename to javaUtilities/hydro/ohd.sshp/.project diff --git a/nativeLib/ohd.sshp/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.sshp/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.sshp/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.sshp/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.sshp/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.sshp/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.sshp/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.sshp/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.sshp/build.properties b/javaUtilities/hydro/ohd.sshp/build.properties similarity index 100% rename from nativeLib/ohd.sshp/build.properties rename to javaUtilities/hydro/ohd.sshp/build.properties diff --git a/nativeLib/ohd.sshp/build.xml b/javaUtilities/hydro/ohd.sshp/build.xml similarity index 100% rename from nativeLib/ohd.sshp/build.xml rename to javaUtilities/hydro/ohd.sshp/build.xml diff --git a/nativeLib/ohd.sshp/ohd.sshp.ecl b/javaUtilities/hydro/ohd.sshp/ohd.sshp.ecl similarity index 100% rename from nativeLib/ohd.sshp/ohd.sshp.ecl rename to javaUtilities/hydro/ohd.sshp/ohd.sshp.ecl diff --git a/nativeLib/ohd.sshp/scripts/process_hydro_model_data b/javaUtilities/hydro/ohd.sshp/scripts/process_hydro_model_data similarity index 100% rename from nativeLib/ohd.sshp/scripts/process_hydro_model_data rename to javaUtilities/hydro/ohd.sshp/scripts/process_hydro_model_data diff --git a/nativeLib/ohd.sshp/scripts/run_SSHP_HPN_preprocess b/javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_HPN_preprocess similarity index 100% rename from nativeLib/ohd.sshp/scripts/run_SSHP_HPN_preprocess rename to javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_HPN_preprocess diff --git a/nativeLib/ohd.sshp/scripts/run_SSHP_MAP_preprocess b/javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_MAP_preprocess similarity index 100% rename from nativeLib/ohd.sshp/scripts/run_SSHP_MAP_preprocess rename to javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_MAP_preprocess diff --git a/nativeLib/ohd.sshp/scripts/run_SSHP_SAC_state_update b/javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_SAC_state_update similarity index 100% rename from nativeLib/ohd.sshp/scripts/run_SSHP_SAC_state_update rename to javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_SAC_state_update diff --git a/nativeLib/ohd.sshp/scripts/run_SSHP_data_decode b/javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_data_decode similarity index 100% rename from nativeLib/ohd.sshp/scripts/run_SSHP_data_decode rename to javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_data_decode diff --git a/nativeLib/ohd.sshp/scripts/run_SSHP_data_send b/javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_data_send similarity index 100% rename from nativeLib/ohd.sshp/scripts/run_SSHP_data_send rename to javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_data_send diff --git a/nativeLib/ohd.sshp/scripts/run_SSHP_data_transfer b/javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_data_transfer similarity index 100% rename from nativeLib/ohd.sshp/scripts/run_SSHP_data_transfer rename to javaUtilities/hydro/ohd.sshp/scripts/run_SSHP_data_transfer diff --git a/nativeLib/ohd.sshp/scripts/run_SiteSpecific b/javaUtilities/hydro/ohd.sshp/scripts/run_SiteSpecific similarity index 100% rename from nativeLib/ohd.sshp/scripts/run_SiteSpecific rename to javaUtilities/hydro/ohd.sshp/scripts/run_SiteSpecific diff --git a/nativeLib/ohd.sshp/scripts/run_UnitHydrographEditor b/javaUtilities/hydro/ohd.sshp/scripts/run_UnitHydrographEditor similarity index 100% rename from nativeLib/ohd.sshp/scripts/run_UnitHydrographEditor rename to javaUtilities/hydro/ohd.sshp/scripts/run_UnitHydrographEditor diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/AboutInfo.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/AboutInfo.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/AboutInfo.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/AboutInfo.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/AppController.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/AppController.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/AppController.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/AppController.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/DataMgr.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/DataMgr.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/DataMgr.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/DataMgr.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/FFHDescriptor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/FFHDescriptor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/FFHDescriptor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/FFHDescriptor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/FcstTsDescriptor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/FcstTsDescriptor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/FcstTsDescriptor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/FcstTsDescriptor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/ForecastPoster.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/ForecastPoster.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/ForecastPoster.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/ForecastPoster.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/IngestFilterTsDescriptor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/IngestFilterTsDescriptor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/IngestFilterTsDescriptor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/IngestFilterTsDescriptor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/ModelManager.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/ModelManager.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/ModelManager.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/ModelManager.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/ProcTsDescriptor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/ProcTsDescriptor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/ProcTsDescriptor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/ProcTsDescriptor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/SSHP.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SSHP.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/SSHP.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SSHP.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/SSHPConfig.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SSHPConfig.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/SSHPConfig.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SSHPConfig.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/SSHPSource.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SSHPSource.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/SSHPSource.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SSHPSource.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/SacSmaStateDescriptor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SacSmaStateDescriptor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/SacSmaStateDescriptor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SacSmaStateDescriptor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/SacStateUpdater.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SacStateUpdater.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/SacStateUpdater.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/SacStateUpdater.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/StreamModel.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/StreamModel.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/StreamModel.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/StreamModel.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/GuiHelper.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/GuiHelper.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/GuiHelper.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/GuiHelper.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/PositionedText.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/PositionedText.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/PositionedText.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/PositionedText.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/PrecipPainter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/PrecipPainter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/PrecipPainter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/PrecipPainter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/PrecipTotalTextPainter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/PrecipTotalTextPainter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/PrecipTotalTextPainter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/PrecipTotalTextPainter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/SettingPanel.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/SettingPanel.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/SettingPanel.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/SettingPanel.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/SigStageLinePainter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/SigStageLinePainter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/SigStageLinePainter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/SigStageLinePainter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/StagePainter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/StagePainter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/StagePainter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/StagePainter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/TableAdapter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/TableAdapter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/TableAdapter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/TableAdapter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/TimeLinePainter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/TimeLinePainter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/TimeLinePainter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/TimeLinePainter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/TsBackgroundPainter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/TsBackgroundPainter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/gui/TsBackgroundPainter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/gui/TsBackgroundPainter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/DecoderDataMgr.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/DecoderDataMgr.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/DecoderDataMgr.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/DecoderDataMgr.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/OfsFileParserException.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/OfsFileParserException.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/OfsFileParserException.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/OfsFileParserException.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLDecoder.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLDecoder.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLDecoder.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLDecoder.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLEncoder.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLEncoder.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLEncoder.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLEncoder.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLTester.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLTester.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLTester.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/SacXMLTester.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/SshpDataTransferMgr.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/SshpDataTransferMgr.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/messaging/SshpDataTransferMgr.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/messaging/SshpDataTransferMgr.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/ArealPrecipPreprocessor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/ArealPrecipPreprocessor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/ArealPrecipPreprocessor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/ArealPrecipPreprocessor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/BaseArealPrecipPreprocessor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/BaseArealPrecipPreprocessor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/BaseArealPrecipPreprocessor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/BaseArealPrecipPreprocessor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/BasinHrapHelper.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/BasinHrapHelper.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/BasinHrapHelper.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/BasinHrapHelper.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/HPNPreprocessor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/HPNPreprocessor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/HPNPreprocessor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/HPNPreprocessor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/MAPPreprocessor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/MAPPreprocessor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/MAPPreprocessor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/MAPPreprocessor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/MPEPreprocessor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/MPEPreprocessor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/MPEPreprocessor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/MPEPreprocessor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/XmrgReader.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/XmrgReader.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/precip/XmrgReader.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/precip/XmrgReader.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/AnalysisWindow.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/AnalysisWindow.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/AnalysisWindow.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/AnalysisWindow.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindow.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindow.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindow.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindow.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindowTableAdapter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindowTableAdapter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindowTableAdapter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindowTableAdapter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindowTableColumnComparator.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindowTableColumnComparator.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindowTableColumnComparator.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/ControlWindowTableColumnComparator.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/FileChooserHelper.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/FileChooserHelper.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/FileChooserHelper.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/FileChooserHelper.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/ForecastTsSaveDialog.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/ForecastTsSaveDialog.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/ForecastTsSaveDialog.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/ForecastTsSaveDialog.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/LiveSacStateEditor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/LiveSacStateEditor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/LiveSacStateEditor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/LiveSacStateEditor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/MonthlyValueEditor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/MonthlyValueEditor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/MonthlyValueEditor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/MonthlyValueEditor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RatingCurveDataPointCanvasAdapter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RatingCurveDataPointCanvasAdapter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RatingCurveDataPointCanvasAdapter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RatingCurveDataPointCanvasAdapter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RatingCurveEditor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RatingCurveEditor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RatingCurveEditor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RatingCurveEditor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RatingPointComparator.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RatingPointComparator.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RatingPointComparator.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RatingPointComparator.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RatingShiftComparator.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RatingShiftComparator.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RatingShiftComparator.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RatingShiftComparator.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RegularTimeSeriesEditor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RegularTimeSeriesEditor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RegularTimeSeriesEditor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RegularTimeSeriesEditor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RegularTimeSeriesEditorDescriptor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RegularTimeSeriesEditorDescriptor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/RegularTimeSeriesEditorDescriptor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/RegularTimeSeriesEditorDescriptor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/SSHPConfigDialog.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/SSHPConfigDialog.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/SSHPConfigDialog.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/SSHPConfigDialog.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/SacParamsEditor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/SacParamsEditor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/SacParamsEditor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/SacParamsEditor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/SacStateEditor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/SacStateEditor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/SacStateEditor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/SacStateEditor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/SshpTableModel.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/SshpTableModel.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/SshpTableModel.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/SshpTableModel.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographCanvasPanel.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographCanvasPanel.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographCanvasPanel.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographCanvasPanel.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDataPointCanvasAdapter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDataPointCanvasAdapter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDataPointCanvasAdapter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDataPointCanvasAdapter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDescriptorComparator.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDescriptorComparator.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDescriptorComparator.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDescriptorComparator.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDescriptorTableAdapter.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDescriptorTableAdapter.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDescriptorTableAdapter.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographDescriptorTableAdapter.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographEditor.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographEditor.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographEditor.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographEditor.java diff --git a/nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographEntryComparator.java b/javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographEntryComparator.java similarity index 100% rename from nativeLib/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographEntryComparator.java rename to javaUtilities/hydro/ohd.sshp/src/ohd/hseb/sshp/window/UnitHydrographEntryComparator.java diff --git a/nativeLib/ohd.swttable/.classpath b/javaUtilities/hydro/ohd.swttable/.classpath similarity index 100% rename from nativeLib/ohd.swttable/.classpath rename to javaUtilities/hydro/ohd.swttable/.classpath diff --git a/nativeLib/ohd.swttable/.project b/javaUtilities/hydro/ohd.swttable/.project similarity index 100% rename from nativeLib/ohd.swttable/.project rename to javaUtilities/hydro/ohd.swttable/.project diff --git a/nativeLib/ohd.swttable/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.swttable/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.swttable/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.swttable/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.swttable/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.swttable/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.swttable/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.swttable/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.swttable/build.properties b/javaUtilities/hydro/ohd.swttable/build.properties similarity index 100% rename from nativeLib/ohd.swttable/build.properties rename to javaUtilities/hydro/ohd.swttable/build.properties diff --git a/nativeLib/ohd.swttable/build.xml b/javaUtilities/hydro/ohd.swttable/build.xml similarity index 100% rename from nativeLib/ohd.swttable/build.xml rename to javaUtilities/hydro/ohd.swttable/build.xml diff --git a/nativeLib/ohd.swttable/ohd.swttable.ecl b/javaUtilities/hydro/ohd.swttable/ohd.swttable.ecl similarity index 100% rename from nativeLib/ohd.swttable/ohd.swttable.ecl rename to javaUtilities/hydro/ohd.swttable/ohd.swttable.ecl diff --git a/nativeLib/ohd.sys_monitor/.classpath b/javaUtilities/hydro/ohd.sys_monitor/.classpath similarity index 100% rename from nativeLib/ohd.sys_monitor/.classpath rename to javaUtilities/hydro/ohd.sys_monitor/.classpath diff --git a/nativeLib/ohd.sys_monitor/.project b/javaUtilities/hydro/ohd.sys_monitor/.project similarity index 100% rename from nativeLib/ohd.sys_monitor/.project rename to javaUtilities/hydro/ohd.sys_monitor/.project diff --git a/nativeLib/ohd.sys_monitor/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.sys_monitor/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.sys_monitor/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.sys_monitor/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.sys_monitor/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.sys_monitor/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.sys_monitor/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.sys_monitor/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.sys_monitor/build.properties b/javaUtilities/hydro/ohd.sys_monitor/build.properties similarity index 100% rename from nativeLib/ohd.sys_monitor/build.properties rename to javaUtilities/hydro/ohd.sys_monitor/build.properties diff --git a/nativeLib/ohd.sys_monitor/build.xml b/javaUtilities/hydro/ohd.sys_monitor/build.xml similarity index 100% rename from nativeLib/ohd.sys_monitor/build.xml rename to javaUtilities/hydro/ohd.sys_monitor/build.xml diff --git a/nativeLib/ohd.sys_monitor/ohd.sys_monitor.ecl b/javaUtilities/hydro/ohd.sys_monitor/ohd.sys_monitor.ecl similarity index 100% rename from nativeLib/ohd.sys_monitor/ohd.sys_monitor.ecl rename to javaUtilities/hydro/ohd.sys_monitor/ohd.sys_monitor.ecl diff --git a/nativeLib/ohd.sys_monitor/scripts/run_sys_monitor b/javaUtilities/hydro/ohd.sys_monitor/scripts/run_sys_monitor similarity index 100% rename from nativeLib/ohd.sys_monitor/scripts/run_sys_monitor rename to javaUtilities/hydro/ohd.sys_monitor/scripts/run_sys_monitor diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/mail/MailHelper.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/mail/MailHelper.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/mail/MailHelper.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/mail/MailHelper.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/AgeFileMonitor.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/AgeFileMonitor.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/AgeFileMonitor.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/AgeFileMonitor.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/ChangeFileMonitor.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/ChangeFileMonitor.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/ChangeFileMonitor.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/ChangeFileMonitor.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/CommandRunner.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/CommandRunner.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/CommandRunner.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/CommandRunner.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/CountFileMonitor.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/CountFileMonitor.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/CountFileMonitor.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/CountFileMonitor.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/EmailReporter.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/EmailReporter.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/EmailReporter.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/EmailReporter.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/ExistenceFileMonitor.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/ExistenceFileMonitor.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/ExistenceFileMonitor.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/ExistenceFileMonitor.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/FileDiff.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/FileDiff.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/FileDiff.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/FileDiff.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/FileMonitor.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/FileMonitor.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/FileMonitor.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/FileMonitor.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/Monitor.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/Monitor.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/Monitor.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/Monitor.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorFactory.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorFactory.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorFactory.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorFactory.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorManager.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorManager.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorManager.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorManager.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorOperator.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorOperator.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorOperator.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorOperator.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorType.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorType.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorType.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/MonitorType.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/Reporter.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/Reporter.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/Reporter.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/Reporter.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/SizeFileMonitor.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/SizeFileMonitor.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/SizeFileMonitor.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/SizeFileMonitor.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/Status.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/Status.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/Status.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/Status.java diff --git a/nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/TextStatus.java b/javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/TextStatus.java similarity index 100% rename from nativeLib/ohd.sys_monitor/src/ohd/hseb/monitor/TextStatus.java rename to javaUtilities/hydro/ohd.sys_monitor/src/ohd/hseb/monitor/TextStatus.java diff --git a/nativeLib/ohd.tsl/.classpath b/javaUtilities/hydro/ohd.tsl/.classpath similarity index 100% rename from nativeLib/ohd.tsl/.classpath rename to javaUtilities/hydro/ohd.tsl/.classpath diff --git a/nativeLib/ohd.tsl/.project b/javaUtilities/hydro/ohd.tsl/.project similarity index 100% rename from nativeLib/ohd.tsl/.project rename to javaUtilities/hydro/ohd.tsl/.project diff --git a/nativeLib/ohd.tsl/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.tsl/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.tsl/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.tsl/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.tsl/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.tsl/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.tsl/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.tsl/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.tsl/build.properties b/javaUtilities/hydro/ohd.tsl/build.properties similarity index 100% rename from nativeLib/ohd.tsl/build.properties rename to javaUtilities/hydro/ohd.tsl/build.properties diff --git a/nativeLib/ohd.tsl/build.xml b/javaUtilities/hydro/ohd.tsl/build.xml similarity index 100% rename from nativeLib/ohd.tsl/build.xml rename to javaUtilities/hydro/ohd.tsl/build.xml diff --git a/nativeLib/ohd.tsl/ohd.tsl.ecl b/javaUtilities/hydro/ohd.tsl/ohd.tsl.ecl similarity index 100% rename from nativeLib/ohd.tsl/ohd.tsl.ecl rename to javaUtilities/hydro/ohd.tsl/ohd.tsl.ecl diff --git a/nativeLib/ohd.tsl/scripts/run_pdc_tsl b/javaUtilities/hydro/ohd.tsl/scripts/run_pdc_tsl similarity index 100% rename from nativeLib/ohd.tsl/scripts/run_pdc_tsl rename to javaUtilities/hydro/ohd.tsl/scripts/run_pdc_tsl diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/gui/util/ScreenCaptureActionListener.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/gui/util/ScreenCaptureActionListener.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/gui/util/ScreenCaptureActionListener.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/gui/util/ScreenCaptureActionListener.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/model/FlowToStageValueMapper.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/model/FlowToStageValueMapper.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/model/FlowToStageValueMapper.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/model/FlowToStageValueMapper.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/model/PrecipPPAndPCValueMapper.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/model/PrecipPPAndPCValueMapper.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/model/PrecipPPAndPCValueMapper.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/model/PrecipPPAndPCValueMapper.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/Location.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/Location.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/Location.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/Location.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/PDCDataType.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/PDCDataType.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/PDCDataType.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/PDCDataType.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/ParamCode.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/ParamCode.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/ParamCode.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/ParamCode.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/TSLDrawingMgr.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/TSLDrawingMgr.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/TSLDrawingMgr.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/TSLDrawingMgr.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/TSLFrame.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/TSLFrame.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/TSLFrame.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/TSLFrame.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/TimeSeriesLite.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/TimeSeriesLite.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/TimeSeriesLite.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/TimeSeriesLite.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/SignificantLinePainter.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/SignificantLinePainter.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/SignificantLinePainter.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/SignificantLinePainter.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsBarPainter.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsBarPainter.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsBarPainter.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsBarPainter.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsCanvasToolTipListener.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsCanvasToolTipListener.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsCanvasToolTipListener.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsCanvasToolTipListener.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsDataPointPainter.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsDataPointPainter.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsDataPointPainter.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TsDataPointPainter.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslBackgroundPainter.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslBackgroundPainter.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslBackgroundPainter.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslBackgroundPainter.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslCanvasPainter.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslCanvasPainter.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslCanvasPainter.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslCanvasPainter.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslTimeLinePainter.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslTimeLinePainter.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslTimeLinePainter.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/gui/drawing/TslTimeLinePainter.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/pdc/PDCDrawingMgr.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/pdc/PDCDrawingMgr.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/pdc/PDCDrawingMgr.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/pdc/PDCDrawingMgr.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/pdc/PdcTslDataManager.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/pdc/PdcTslDataManager.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/pdc/PdcTslDataManager.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/pdc/PdcTslDataManager.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/rivermon/RiverMonDrawingMgr.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/rivermon/RiverMonDrawingMgr.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/rivermon/RiverMonDrawingMgr.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/rivermon/RiverMonDrawingMgr.java diff --git a/nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/rivermon/RiverMonTslDataManager.java b/javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/rivermon/RiverMonTslDataManager.java similarity index 100% rename from nativeLib/ohd.tsl/src/ohd/hseb/timeserieslite/rivermon/RiverMonTslDataManager.java rename to javaUtilities/hydro/ohd.tsl/src/ohd/hseb/timeserieslite/rivermon/RiverMonTslDataManager.java diff --git a/nativeLib/ohd.var/.classpath b/javaUtilities/hydro/ohd.var/.classpath similarity index 100% rename from nativeLib/ohd.var/.classpath rename to javaUtilities/hydro/ohd.var/.classpath diff --git a/nativeLib/ohd.var/.project b/javaUtilities/hydro/ohd.var/.project similarity index 100% rename from nativeLib/ohd.var/.project rename to javaUtilities/hydro/ohd.var/.project diff --git a/nativeLib/ohd.var/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/hydro/ohd.var/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from nativeLib/ohd.var/.settings/org.eclipse.jdt.core.prefs rename to javaUtilities/hydro/ohd.var/.settings/org.eclipse.jdt.core.prefs diff --git a/nativeLib/ohd.var/META-INF/MANIFEST.MF b/javaUtilities/hydro/ohd.var/META-INF/MANIFEST.MF similarity index 100% rename from nativeLib/ohd.var/META-INF/MANIFEST.MF rename to javaUtilities/hydro/ohd.var/META-INF/MANIFEST.MF diff --git a/nativeLib/ohd.var/build.properties b/javaUtilities/hydro/ohd.var/build.properties similarity index 100% rename from nativeLib/ohd.var/build.properties rename to javaUtilities/hydro/ohd.var/build.properties diff --git a/nativeLib/ohd.var/build.xml b/javaUtilities/hydro/ohd.var/build.xml similarity index 100% rename from nativeLib/ohd.var/build.xml rename to javaUtilities/hydro/ohd.var/build.xml diff --git a/nativeLib/ohd.var/ohd.var.ecl b/javaUtilities/hydro/ohd.var/ohd.var.ecl similarity index 100% rename from nativeLib/ohd.var/ohd.var.ecl rename to javaUtilities/hydro/ohd.var/ohd.var.ecl diff --git a/nativeLib/ohd.var/scripts/readme.txt b/javaUtilities/hydro/ohd.var/scripts/readme.txt similarity index 100% rename from nativeLib/ohd.var/scripts/readme.txt rename to javaUtilities/hydro/ohd.var/scripts/readme.txt diff --git a/nativeLib/ohd.var/scripts/run_SSHP_Databasepopulater b/javaUtilities/hydro/ohd.var/scripts/run_SSHP_Databasepopulater similarity index 100% rename from nativeLib/ohd.var/scripts/run_SSHP_Databasepopulater rename to javaUtilities/hydro/ohd.var/scripts/run_SSHP_Databasepopulater diff --git a/nativeLib/ohd.var/scripts/run_SSHP_var b/javaUtilities/hydro/ohd.var/scripts/run_SSHP_var similarity index 100% rename from nativeLib/ohd.var/scripts/run_SSHP_var rename to javaUtilities/hydro/ohd.var/scripts/run_SSHP_var diff --git a/nativeLib/ohd.var/scripts/run_var_assimilator b/javaUtilities/hydro/ohd.var/scripts/run_var_assimilator similarity index 100% rename from nativeLib/ohd.var/scripts/run_var_assimilator rename to javaUtilities/hydro/ohd.var/scripts/run_var_assimilator diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/DataAbsentException.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/DataAbsentException.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/DataAbsentException.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/DataAbsentException.java diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/FortranScriptRunningException.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/FortranScriptRunningException.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/FortranScriptRunningException.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/FortranScriptRunningException.java diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/InputFilesGenerator.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/InputFilesGenerator.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/InputFilesGenerator.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/InputFilesGenerator.java diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/OutputFileManager.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/OutputFileManager.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/OutputFileManager.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/OutputFileManager.java diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/OutputFileTester.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/OutputFileTester.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/OutputFileTester.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/OutputFileTester.java diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/StreamDrainer.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/StreamDrainer.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/StreamDrainer.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/StreamDrainer.java diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/VarAssimilationProgramExecuter.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/VarAssimilationProgramExecuter.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/VarAssimilationProgramExecuter.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/VarAssimilationProgramExecuter.java diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/VarController.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/VarController.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/VarController.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/VarController.java diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/VarDataMgr.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/VarDataMgr.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/VarDataMgr.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/VarDataMgr.java diff --git a/nativeLib/ohd.var/src/ohd/hseb/sshp/var/VarHelper.java b/javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/VarHelper.java similarity index 100% rename from nativeLib/ohd.var/src/ohd/hseb/sshp/var/VarHelper.java rename to javaUtilities/hydro/ohd.var/src/ohd/hseb/sshp/var/VarHelper.java