reorganized to suite yieldfrom namespace package