Much nicer makefile structure (same as used for thesis). Builds fully &
correctly first time now.