yet another reorg. Moved package to oct-circuits