File restructure