directory structure adjusted