partly refactored PluginInfo based on the TODOs determined in the unit-testing. Unit-tests are updated as well of course