Updated Structure of the scripts