cleaned up makefile and directories