diff --git a/.gitignore b/.gitignore
index 1a994a2..c15d414 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,7 @@ hs_err_pid*
 
 # IntelliJ
 .idea/
-*.iml
\ No newline at end of file
+*.iml
+
+# Maven
+target/
diff --git a/controllers/pom.xml b/controllers/pom.xml
index ab0550a..2768d11 100644
--- a/controllers/pom.xml
+++ b/controllers/pom.xml
@@ -11,9 +11,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.oracle.ozark</groupId>
+			<groupId>org.glassfish.ozark</groupId>
             <artifactId>ozark</artifactId>
-            <version>1.0.0-m01</version>
+            <version>1.0.0-m02</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/HybridController.java b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/HybridController.java
index a431884..b8752b9 100644
--- a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/HybridController.java
+++ b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/HybridController.java
@@ -1,9 +1,8 @@
 package com.mscharhag.javaee8.mvc.controllers;
 
-import com.oracle.ozark.core.Models;
-
 import javax.inject.Inject;
-import javax.mvc.Controller;
+import javax.mvc.annotation.Controller;
+import javax.mvc.Models;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
diff --git a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/PostController.java b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/PostController.java
index 1417a30..b8453a5 100644
--- a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/PostController.java
+++ b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/PostController.java
@@ -1,6 +1,6 @@
 package com.mscharhag.javaee8.mvc.controllers;
 
-import javax.mvc.Controller;
+import javax.mvc.annotation.Controller;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 
diff --git a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ReturnTypesController.java b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ReturnTypesController.java
index 6828908..fb1a10d 100644
--- a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ReturnTypesController.java
+++ b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ReturnTypesController.java
@@ -1,7 +1,7 @@
 package com.mscharhag.javaee8.mvc.controllers;
 
-import javax.mvc.Controller;
-import javax.mvc.View;
+import javax.mvc.annotation.Controller;
+import javax.mvc.annotation.View;
 import javax.mvc.Viewable;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -24,7 +24,7 @@ public String returnString() {
     }
 
     @GET
-    @Path("return-string")
+    @Path("return-viewable")
     public Viewable returnViewable() {
         return new Viewable("/WEB-INF/jsp/hello.jsp");
     }
diff --git a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ViewController.java b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ViewController.java
index 9aedd8a..ad3770e 100644
--- a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ViewController.java
+++ b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ViewController.java
@@ -1,7 +1,7 @@
 package com.mscharhag.javaee8.mvc.controllers;
 
-import javax.mvc.Controller;
-import javax.mvc.View;
+import javax.mvc.annotation.Controller;
+import javax.mvc.annotation.View;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
diff --git a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/product/ProductController.java b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/product/ProductController.java
index d9edf60..ca39ac5 100644
--- a/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/product/ProductController.java
+++ b/controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/product/ProductController.java
@@ -1,7 +1,7 @@
 package com.mscharhag.javaee8.mvc.controllers.product;
 
 import javax.inject.Inject;
-import javax.mvc.Controller;
+import javax.mvc.annotation.Controller;
 import javax.mvc.Models;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/getting-started/pom.xml b/getting-started/pom.xml
index b499982..33ca00a 100644
--- a/getting-started/pom.xml
+++ b/getting-started/pom.xml
@@ -11,9 +11,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.oracle.ozark</groupId>
+            <groupId>org.glassfish.ozark</groupId>
             <artifactId>ozark</artifactId>
-            <version>1.0.0-m01</version>
+            <version>1.0.0-m02</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/getting-started/src/main/java/com/mscharhag/javaee8/mvc/getstarted/HelloController.java b/getting-started/src/main/java/com/mscharhag/javaee8/mvc/getstarted/HelloController.java
index 8f6b68e..3916997 100644
--- a/getting-started/src/main/java/com/mscharhag/javaee8/mvc/getstarted/HelloController.java
+++ b/getting-started/src/main/java/com/mscharhag/javaee8/mvc/getstarted/HelloController.java
@@ -1,9 +1,8 @@
 package com.mscharhag.javaee8.mvc.getstarted;
 
-import com.oracle.ozark.core.Models;
-
 import javax.inject.Inject;
-import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.mvc.annotation.Controller;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
diff --git a/getting-started/src/main/webapp/WEB-INF/jsp/hello.jsp b/getting-started/src/main/webapp/WEB-INF/jsp/hello.jsp
index 89c0e44..09b6c1f 100644
--- a/getting-started/src/main/webapp/WEB-INF/jsp/hello.jsp
+++ b/getting-started/src/main/webapp/WEB-INF/jsp/hello.jsp
@@ -7,6 +7,6 @@
     </head>
     <body>
         <p>Getting started (hello.jsp)</p>
-        <h1>${text}</h1>
+        <h1>${mvc.encoders.html(text)}</h1>
     </body>
 </html>
diff --git a/request-data/pom.xml b/request-data/pom.xml
index 19aca65..830b455 100644
--- a/request-data/pom.xml
+++ b/request-data/pom.xml
@@ -11,9 +11,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.oracle.ozark</groupId>
+            <groupId>org.glassfish.ozark</groupId>
             <artifactId>ozark</artifactId>
-            <version>1.0.0-m01</version>
+            <version>1.0.0-m02</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/FormParamsController.java b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/FormParamsController.java
index 53ad13d..6a14d4b 100644
--- a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/FormParamsController.java
+++ b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/FormParamsController.java
@@ -1,8 +1,8 @@
 package com.mscharhag.javaee8.mvc.requestparams;
 
 import javax.inject.Inject;
-import javax.mvc.Controller;
-import com.oracle.ozark.core.Models;
+import javax.mvc.annotation.Controller;
+import javax.mvc.Models;
 
 import javax.ws.rs.*;
 
diff --git a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/HeaderParamsController.java b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/HeaderParamsController.java
index 3746eeb..eedf309 100644
--- a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/HeaderParamsController.java
+++ b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/HeaderParamsController.java
@@ -1,9 +1,8 @@
 package com.mscharhag.javaee8.mvc.requestparams;
 
-import com.oracle.ozark.core.Models;
-
 import javax.inject.Inject;
-import javax.mvc.Controller;
+import javax.mvc.annotation.Controller;
+import javax.mvc.Models;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
 import javax.ws.rs.Path;
diff --git a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/PathParamsController.java b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/PathParamsController.java
index b26182d..b39dc89 100644
--- a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/PathParamsController.java
+++ b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/PathParamsController.java
@@ -1,9 +1,8 @@
 package com.mscharhag.javaee8.mvc.requestparams;
 
-import com.oracle.ozark.core.Models;
-
 import javax.inject.Inject;
-import javax.mvc.Controller;
+import javax.mvc.annotation.Controller;
+import javax.mvc.Models;
 import javax.ws.rs.*;
 
 @Controller
diff --git a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsController.java b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsController.java
index 79babfa..ada26a9 100644
--- a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsController.java
+++ b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsController.java
@@ -1,9 +1,8 @@
 package com.mscharhag.javaee8.mvc.requestparams;
 
-import com.oracle.ozark.core.Models;
-
 import javax.inject.Inject;
-import javax.mvc.Controller;
+import javax.mvc.annotation.Controller;
+import javax.mvc.Models;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
diff --git a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsFieldController.java b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsFieldController.java
index a73168b..0f8ee42 100644
--- a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsFieldController.java
+++ b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsFieldController.java
@@ -1,9 +1,8 @@
 package com.mscharhag.javaee8.mvc.requestparams;
 
-import com.oracle.ozark.core.Models;
-
 import javax.inject.Inject;
-import javax.mvc.Controller;
+import javax.mvc.annotation.Controller;
+import javax.mvc.Models;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
diff --git a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/RequestController.java b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/RequestController.java
index 45e8876..f480716 100644
--- a/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/RequestController.java
+++ b/request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/RequestController.java
@@ -1,9 +1,8 @@
 package com.mscharhag.javaee8.mvc.requestparams;
 
-import com.oracle.ozark.core.Models;
-
 import javax.inject.Inject;
-import javax.mvc.Controller;
+import javax.mvc.annotation.Controller;
+import javax.mvc.Models;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
diff --git a/request-data/src/main/webapp/WEB-INF/jsp/form.jsp b/request-data/src/main/webapp/WEB-INF/jsp/form.jsp
index 62741b5..6833b8f 100644
--- a/request-data/src/main/webapp/WEB-INF/jsp/form.jsp
+++ b/request-data/src/main/webapp/WEB-INF/jsp/form.jsp
@@ -6,7 +6,7 @@
     <title>Request Parameters</title>
   </head>
   <body>
-    <h1>${text}</h1>
+    <h1>${mvc.encoders.html(text)}</h1>
 
     <form action="bean" method="post">
       <label>ID:</label>
diff --git a/request-data/src/main/webapp/WEB-INF/jsp/view.jsp b/request-data/src/main/webapp/WEB-INF/jsp/view.jsp
index e8998e7..2c09075 100644
--- a/request-data/src/main/webapp/WEB-INF/jsp/view.jsp
+++ b/request-data/src/main/webapp/WEB-INF/jsp/view.jsp
@@ -7,6 +7,6 @@
         <title>Request Parameters</title>
     </head>
     <body>
-        <h1>${text}</h1>
+        <h1>${mvc.encoders.html(text)}</h1>
     </body>
 </html>