Updated package names, attributes have been prefixed, and example tidied