Move axis-specific data to a more appropriate location;