Compliance with the new structure of directories