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

brian978/Acamar-SkeletonApplication,brian978/Acamar-SkeletonApplication