re-structure into correct directory