Restructuring conditional
Restructuring conditional

Enyo-DCO-1.1-Signed-off-by: Jeremy Thomas <jeremy.thomas@lge.com>

beni55/enyo,beni55/enyo,mcanthony/enyo,PKRoma/enyo,wikieswan/enyo,wikieswan/enyo,enyojs/enyo,soapdog/enyo,mcanthony/enyo,PKRoma/enyo,bright-sparks/enyo,kustomzone/enyo,zefsolutions/enyo,zefsolutions/enyo,soapdog/enyo,kustomzone/enyo,bright-sparks/enyo,enyojs/enyo