Added a simple makefile and cleaned up internal representation of State