Organize makefile