Scripts restructured