More refactoring, configurator module