reorg files to folders, bit of fonting