[OE-3945] Fixed import paths