Moving Variable file around to fix cyclic package problems.