Makefile moved, VPATH added