Outsourced some wcs stuff; cleaned up some imports