Changed the way the package is defined