adapt to new dir layout