updated makefile and layout classname method