Cleaned up AlbumViewController and renamed to FolderViewController