Cleaned up package loading and lisp organization