Fixed cl import and defstruct