Changed package, added copyright