Refactoring
Improving organization for the Makefile