Changed Scripts structure