re-do directory structure