unit tests, restructuring of config