reorg for using aegit