Some attempds to fix the new directory structure.