WARZONE part 2: Further cleanup and reorganization.