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

<!-- Begin mockup: In order to preserve an editable mockup, please
     don't edit this section directly.
     Click the "edit" link below the image in the preview instead. -->

![mockup](https://i.sstatic.net/hshxJ.png)

<!-- End mockup -->

<!-- Begin mockup: In order to preserve an editable mockup, please
     don't edit this section directly.
     Click the "edit" link below the image in the preview instead. -->

![mockup](https://i.sstatic.net/xNCqf.png)

<!-- End mockup -->