Move code from id.c to entry.c and add.c