directory structure edits, changed Makefile