Updated Makefile with valgrind option and better organization.