-changed folder structure to resemble original version
-placed makefile in root folder
-removed redundant gtest folder (using old testinglib one instead)
-changed includes accordingly