Rearranged directories so that I had a place to put gtest (a C++ unit testing framework written by Google). gtest isn't support yet in this app.

Also added macros to the makefile