bit of restructuring, and finishing the Makefile. I'm pretty happy with the Makefile ;-)