adapt to new directory structure