We should be able to combine these files into one Cython source?