Combining a grid view and list view on the same interface

Question

I'm working on a UI which needs to include a series of video thumbnails and folders containing more video thumbnails.

At current, the videos are being layed out in a 'list view'. A video thumbnail appers on the left and metada fills up the real estate on the right. (see image below)

Soon we will need to include video folders as well as video thumbnails. I've been asked to place the video folders in a grid view above the video thumbnails (as seen below)

Although I don't like the idea of compbining a list view and a grid view. I've considered maintaining consistency of the interface by applying the list style layout to the interface (see below)

However by doing this less content will be seen above the fold. Unfortunately we cannot apply the grid view to the video thumbnails. Any suggestions on how to approach this?

Answer 1

Use 3 or 4 column grid for everything and separate Folders and Video with sub-headings Or without them and separate folders and videos with double amount of space. As listing everything in one line could cause a lot of scrolling.

Use proximity(Visually Group Related Elements) to differentiate between folders and videos

^{download bmml source – Wireframes created with Balsamiq Mockups}

^{download bmml source}