Changed directory structure
Added gtest
Completed directory restructure and cmake file
Merge changes
Refine cmake comments