Moved a global var definition
Scripts reorganized