[OE-3949] module recreated with seperate elements