Rearrange directory layout.

As discussed in Issue #85