These changes were moved into the proper files