Update and rename heap.c to heap2.c