re-structure files