Add performance tests & reorganization.