Changed for using new config settings to determine folders
Revert "Changed for using new config settings to determine folders"

This reverts commit 80c4f3efe9f580c63856c395768e11418a2c4cc9.
Revert "Revert "Changed for using new config settings to determine folders""

This reverts commit dd15b664687772dbc72e6a7d8180a2edb8e9cbbf.