Further orginization and development of scripts