Reformat to new structure