More work on the reformat
The C network is repaired, so we won't need the python one for now.
Merging