fixed for new directory structure