reorganize directories a bit