Reorganized some of the IDs for the upcoming changes