Improved folder/filter setup
Merged tweaks to file layout and filters