Moving classes around to make the class structure more easily understandable.