Fixed directory layout.
Added CVE-2010-3711 2-5.