Reshuffle around, tests in tests/, correlated branch predictor in its own file