restructured: introduced war module