Changed package names to fully qualified paths.
Updated package structure.