DIVERBEVAN-46 Change dir structure