CRM-13737 fix d6 code to facilite altered directory structure