S-4: Modules as configurable plugins: removing data dir leftovers (WIP)