Cleanup el-get packages; remove duplicates and group logically