Deck management, reorganized scripts