Updated package structure and definition.