Rearranged objects so we can deal with reasonable x,y,z structure