scripts re-organisation