package structure updates