Changing how some things are organized.