fixed package structure pt2