+ Using Swig view templates now
- Deleted obsolete things