Reorganize the combination of different configurations

Work in progress