Make

Updated the makefile for object orientedness.