minor updates to layout an packages