Cosmetic changes, added empty methods for GTest, some files renamed,