Added WMS_WCS Module and clean up.