Use sling:Folder as primary type for folders - closes #1