Major directory restructuration.