Added Makefile. Moved things around a little.