Bugfixes and module structure update

- Fix a bug in the inheritance structure
- Clean up a leftover in the model
- Reorganise the module structure