Moved some classes/methods to ioos-sos-common