Folder refactoring; Removed FolderCollection model; Cached some Folder info