Move mocks and predictor to modules