Reorganized configs' layout