moved the stuff out of spinnaker tools tools folder so that they are handled in correct places