3rd commit. Mostly organizational stuff as well as added Makefile