Major clean-up and refactoring to prepare for OnDA 1.0. Currently only the refactored modules are left in the branch. The other missing modules will be reintroduced later