Yet another fix for directory structure and name change...