Fixing for new directory structure