diff --git a/jans-fido2/model/pom.xml b/jans-fido2/model/pom.xml
index cc706342205..308cc763077 100644
--- a/jans-fido2/model/pom.xml
+++ b/jans-fido2/model/pom.xml
@@ -27,12 +27,26 @@
                 <groupId>io.jans</groupId>
                 <artifactId>jans-auth-model</artifactId>
             </dependency>
-
+		
 			<!-- Jackson -->
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-annotations</artifactId>
 			</dependency>
+			<!-- Weld -->
+	        <dependency>
+	            <groupId>org.jboss.weld.servlet</groupId>
+	            <artifactId>weld-servlet-core</artifactId>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.jboss.weld</groupId>
+	            <artifactId>weld-core-impl</artifactId>
+	        </dependency>
+			<dependency>
+				<groupId>jakarta.servlet</groupId>
+				<artifactId>jakarta.servlet-api</artifactId>
+				<scope>provided</scope>
+			</dependency>
 	</dependencies>
 	
 </project>
\ No newline at end of file
diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/model/conf/AppConfiguration.java b/jans-fido2/model/src/main/java/io/jans/fido2/model/conf/AppConfiguration.java
similarity index 100%
rename from jans-fido2/server/src/main/java/io/jans/fido2/model/conf/AppConfiguration.java
rename to jans-fido2/model/src/main/java/io/jans/fido2/model/conf/AppConfiguration.java
diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/model/conf/Conf.java b/jans-fido2/model/src/main/java/io/jans/fido2/model/conf/Conf.java
similarity index 100%
rename from jans-fido2/server/src/main/java/io/jans/fido2/model/conf/Conf.java
rename to jans-fido2/model/src/main/java/io/jans/fido2/model/conf/Conf.java
diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/model/conf/Fido2Configuration.java b/jans-fido2/model/src/main/java/io/jans/fido2/model/conf/Fido2Configuration.java
similarity index 100%
rename from jans-fido2/server/src/main/java/io/jans/fido2/model/conf/Fido2Configuration.java
rename to jans-fido2/model/src/main/java/io/jans/fido2/model/conf/Fido2Configuration.java
diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/model/conf/RequestedParty.java b/jans-fido2/model/src/main/java/io/jans/fido2/model/conf/RequestedParty.java
similarity index 100%
rename from jans-fido2/server/src/main/java/io/jans/fido2/model/conf/RequestedParty.java
rename to jans-fido2/model/src/main/java/io/jans/fido2/model/conf/RequestedParty.java