Major structural changes

- Mustache —> SWIG
- Lots of minor changes