Reorganize configuration