Recombobulating directory structure RE: conversation with prusso.