Some reshuffling of files to make visual studio happy
Added gtest to folly