Updating makefile,, adding singleton class