refactor for new packages in el-get