update for new dir structure