Basic restructure to start perf testing