update for new directory structure