Cleanup some of the c code organization

Mostly shuffling code around, but also removes an unused but exported function. The function was marked private and I think it is safe to remove, but this will probably trigger distros abi checks.