Moved envelope stuff out in to owm name space.