prototype directory added, combined Makefile