module reorg (2): get rid of java.awt.* in cdm module; move wcs to clcommon