Refactoring serve to prevent folder pollution
Extracting more content from war builder