Added subdirectories and updated VPATH in makefile.