Layout improvements in /contrib
Add /var/lib/contrib