More organization of the directory structure