Truly organized .c and .h files; corrected Makefile