Reorganised scripts