Moving Makefile back