Updated to new trunk layout.