Improving how we handle files on a single folder (ie no categories)