Add all location codes and reorganize headers