Folders now self-contained