Folder previews & some refactoring.