Add basic src/ and Makefile hooks
Merge