Changed the package declarations.