Modified the layout for the configuration files
(cherry picked from commit c219ca2)