adapting new directory structure