I rescind my objection. Let's leave the deployment machinery in place for a multi-file release (you have), but we can put everything in the war for now if that's what's easiest.