Rebuilt the structure so we can hopefully import. May need to rollback if it breaks things.