Changed package name to adhere to guidelines