fix paths for new directory structure