Switching to lychee.Package based architecture