Separating main and updating Makefile