Viper, reorganize