reorganize working dir