[OE-3945] Fixed import paths and initial print related amends