Integrate gsoc benchmark code after cleanup and refactoring