Huge refactoring to remove diego' C/C++ chimera code.