Revert "Folder names changed"

This reverts commit 68b24fa04611ae9d80c863489792ce0460ebcc97.