redid directory structure for new makefile