Config tree reorganized