Change to SWIG, clean up CMAKE