Added ShuffleImprov, NaturalDisasterImprov

Misc folder reshuffling
Added Test