Makefile and some moves