cleaned up directory structure, paths, and makefile