[PATCH 2/3] Use package module, so we can simplify the package installation