changing a few war/ directory naming and organization conventions