Changed package name, cleaned some code.