directory structure changed; Makefile added