Refactored the perfomance structure

Yet another refactor