Data migration [1/3]

Add old models back in and rename conflicting new Header model