Removing dir for cancelled class, rename makefile.