Restructuring to put all config at base