re-fix for new directory structure