0.9.5: Folder cleanups