Reduce directory depth by one.

Change-Id: I7f89df61135ff19169ed97633a662685d414c448