Add in header
Update Makefile
More code organisation