ADEN-1290 Restructure SOI variables
Merge pull request #4258 from Wikia/aden-1290-restructure-soi-vars

ADEN-1290 Restructure SOI variables