Adding some misplaced files, further work on Makefile.