Re-structure files