Move Envelope to main Bernard namespace