Add next part of web xml parser, refactor parser