Refactored, changed makefile