Added Makefile. Simple refactoring.