Made into seperate files
Modified Makefile to be modular