fixing errors made in repo-reorg