Code cleanup

renamed a package and removed an unwanted method implementation.