Changed package, updated copyright notice