Data-Structure-Rewrite in C