reorganizing cpython code