Reorganized o+ to mirror o- more closely

Signed-off-by: Christian Romney <cromney@pointslope.com>