re-structure directories/files