fixed package names
improved class names
renaming and more tests
test verify: location doesnt change the signature