Modified makefile to subdirs, modified testfiles, added sample3