Refactored project to compile with Makefile