More breaking apart and move around the Cython code.