Revert 4486ca0..94f5359

This rolls back to commit 4486ca047c0f15bdb1dca6a0aa64cdd058356fc6.
Aspects + bug fixes

- Many bug fixes
- Extensive restructuring of code
- Support for aspect-oriented ontology development