Reorder file structure