Major package structure change.