Added swig and organized stuff