Reorg II: Bugfixes

This is a followup to the previous PR with some fixes and the configuration. Just add a modules property to your config to load the proper modules.