Minor changes
Config submodule splitting