Revert "move variabes"

This reverts commit 5ed5102ebca0d19ca619558e15da24bb5d026931.