[OE-3723] directory structure