Changed package name, added keywords