Reorganize folders and pretty up the C output.