Updated makefile for new files, also added stubs for needed classes