Reworked directory structure to match gtest style