Lots of refactoring:
* split up metadata into modules
* one package per IF
* use simpler module names