fixed Makefile and directory structure