Merge "Flatten configuration structure"