reduce top folder clutter

[#70413506]