Fixed package declarations.