Rearranging more things.
Finished op model.