reorg for godep