modernize directory structure.