re-structure directories