Switched package name back, at the request of Manuel A. Fernandez Montecelo