Update config merge.
Move structure