refactor(config): Further reorganise of config module. Like this result better :)