SWIG moved to package and patch