changed directory structure around somewhat.  I am also working on using CMake to compile the project rather than having everything hardcoded in one makefile