Move package definitions from .i file to separate lisp file