reorganize data-struct.lisp