Reorg .c files to make more sense w.r.t header file org