reworked folders a bit
moved a thing