Correct the default configuration structure

Follow up  I7c5237c6dfff9b9c6ee6e072112b0b5a99292b1e

Change-Id: Ife93f1f6c5d67706d256470a76de82b8c3afbd1b
Merge "Correct the default configuration structure"