Updated package structure