Moved closure script, fixing makefile