updates for new dir structure