Update makefile and classpath location