Rejigged the layout of the project to allow for an easier Makefile.

Might need to look at this again.