Applied further review comments for config folder change.