Move around Makefile