Restructure C file layout
moving
moving
Move done