directory structure improvements