Script reorganization