Re-organize the scripts