Moved around scripts between files