adjust Makefile structure and directories.