Revert "Folders"

This reverts commit d23445eda173bda06b2fe1280c58daa7651622b9.