Tidied up makefile

Introduced more files to collect our many definitions. This hopefully
improves readability of our Make project