restructure el-get management