diff --git a/nav-bsrv-sah-brevbestilling-legacy/pom.xml b/nav-bsrv-sah-brevbestilling-legacy/pom.xml
index d86f243..cff8531 100644
--- a/nav-bsrv-sah-brevbestilling-legacy/pom.xml
+++ b/nav-bsrv-sah-brevbestilling-legacy/pom.xml
@@ -29,11 +29,10 @@
-xjc-npa
-
-
- ${basedir}/src/main/resources/wsdl/BrevbestillingInternt.wsdl
-
-
+ ${basedir}/src/main/resources/lib/sah/inf
+
+ *.wsdl
+
wsdl2java
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/frg/gbo/GBOHentPersonRequest.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/frg/gbo/GBOHentPersonRequest.xsd
new file mode 100644
index 0000000..cd05307
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/frg/gbo/GBOHentPersonRequest.xsd
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/fault/FaultIkkeGodskrevetOmsorgsPoeng.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/fault/FaultIkkeGodskrevetOmsorgsPoeng.xsd
new file mode 100644
index 0000000..efb272c
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/fault/FaultIkkeGodskrevetOmsorgsPoeng.xsd
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/fault/FaultSakIkkeFunnet.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/fault/FaultSakIkkeFunnet.xsd
new file mode 100644
index 0000000..a28a5d6
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/fault/FaultSakIkkeFunnet.xsd
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/fault/FaultVedtakIkkeFunnet.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/fault/FaultVedtakIkkeFunnet.xsd
new file mode 100644
index 0000000..e89699c
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/fault/FaultVedtakIkkeFunnet.xsd
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentBeregningSammendragAvdodRequest.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentBeregningSammendragAvdodRequest.xsd
new file mode 100644
index 0000000..a118133
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentBeregningSammendragAvdodRequest.xsd
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentBeregningSammendragBrukerRequest.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentBeregningSammendragBrukerRequest.xsd
new file mode 100644
index 0000000..017fd64
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentBeregningSammendragBrukerRequest.xsd
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentOmsorgGodskrGrunnlagRequest.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentOmsorgGodskrGrunnlagRequest.xsd
new file mode 100644
index 0000000..73922bc
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentOmsorgGodskrGrunnlagRequest.xsd
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentOmsorgOverfGrunnlagRequest.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentOmsorgOverfGrunnlagRequest.xsd
new file mode 100644
index 0000000..57a674f
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentOmsorgOverfGrunnlagRequest.xsd
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentPensjonssakListeRequest.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentPensjonssakListeRequest.xsd
new file mode 100644
index 0000000..4fb65d9
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentPensjonssakListeRequest.xsd
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentPersongrunnlagListeRequest.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentPersongrunnlagListeRequest.xsd
new file mode 100644
index 0000000..910e7d3
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentPersongrunnlagListeRequest.xsd
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentTilbakekrevingTotalRequest.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentTilbakekrevingTotalRequest.xsd
new file mode 100644
index 0000000..42dcb77
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOHentTilbakekrevingTotalRequest.xsd
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/fault/FaultPersonIkkeFunnet.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/fault/FaultPersonIkkeFunnet.xsd
new file mode 100644
index 0000000..3eca21f
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/fault/FaultPersonIkkeFunnet.xsd
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/gbo/GBOFinnBostedslandRequest.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/gbo/GBOFinnBostedslandRequest.xsd
new file mode 100644
index 0000000..62fb219
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/gbo/GBOFinnBostedslandRequest.xsd
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/gbo/GBOInndata.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/gbo/GBOInndata.xsd
new file mode 100644
index 0000000..5313bfb
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/gbo/GBOInndata.xsd
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/wsdl/SendPensjonBrev.wsdl b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonBrev.wsdl
similarity index 89%
rename from nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/wsdl/SendPensjonBrev.wsdl
rename to nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonBrev.wsdl
index 529c50e..1689c6f 100644
--- a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/wsdl/SendPensjonBrev.wsdl
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonBrev.wsdl
@@ -1,11 +1,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -49,4 +49,4 @@
-
+
\ No newline at end of file
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonStandardBrev.wsdl b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonStandardBrev.wsdl
new file mode 100644
index 0000000..69bc9c4
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonStandardBrev.wsdl
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonStandardVedtakAndre.wsdl b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonStandardVedtakAndre.wsdl
new file mode 100644
index 0000000..08ec2fa
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonStandardVedtakAndre.wsdl
@@ -0,0 +1,273 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonStandardVedtakPositive.wsdl b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonStandardVedtakPositive.wsdl
new file mode 100644
index 0000000..9dc64dd
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonStandardVedtakPositive.wsdl
@@ -0,0 +1,308 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonVedtakBrev.wsdl b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonVedtakBrev.wsdl
new file mode 100644
index 0000000..856f0ed
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonVedtakBrev.wsdl
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonVedtakFleksibeltUttak.wsdl b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonVedtakFleksibeltUttak.wsdl
new file mode 100644
index 0000000..61a45b8
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonVedtakFleksibeltUttak.wsdl
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonsStandardVedtakNegativBrev.wsdl b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonsStandardVedtakNegativBrev.wsdl
new file mode 100644
index 0000000..3091196
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendPensjonsStandardVedtakNegativBrev.wsdl
@@ -0,0 +1,202 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendSEDBlanketter.wsdl b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendSEDBlanketter.wsdl
new file mode 100644
index 0000000..6329194
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendSEDBlanketter.wsdl
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/wsdl/SendStandardBrev.wsdl b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendStandardBrev.wsdl
similarity index 97%
rename from nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/wsdl/SendStandardBrev.wsdl
rename to nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendStandardBrev.wsdl
index 07f22b2..deb68db 100644
--- a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/wsdl/SendStandardBrev.wsdl
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/sah/inf/SendStandardBrev.wsdl
@@ -2,8 +2,8 @@
-
-
+
+