Added Reorganization for TestBench.