Reorganizing unit scripts