Re-jig el-get setup