Makefile updated for previous code refactoring