Changed namespace and updated .package

Ditto.