Cleanup

Just some miscellaneous file shuffling, artefacts left over from the merge of the Cython predictor