Refactor to produce war file as well