#176 Fixes/restructuring of SWIG interface files