Revert "Folders"

This reverts commit 4ee5b95523b122df810bd36128531d7061246ee3.