diff --git a/adapters/oidc/js/pom.xml b/adapters/oidc/js/pom.xml
index c5af257e3eb..1c95abcfdab 100755
--- a/adapters/oidc/js/pom.xml
+++ b/adapters/oidc/js/pom.xml
@@ -30,9 +30,6 @@
 
 	<build>
 		<resources>
-			<resource>
-				<directory>static</directory>
-			</resource>
 			<resource>
 				<directory>dist</directory>
 			</resource>
diff --git a/services/src/main/java/org/keycloak/services/util/IframeUtil.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java
similarity index 88%
rename from services/src/main/java/org/keycloak/services/util/IframeUtil.java
rename to services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java
index ac71648858f..eac5ac0debf 100644
--- a/services/src/main/java/org/keycloak/services/util/IframeUtil.java
+++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java
@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 
-package org.keycloak.services.util;
+package org.keycloak.protocol.oidc.endpoints;
 
 import org.keycloak.common.Version;
 import org.keycloak.headers.SecurityHeadersProvider;
 import org.keycloak.models.KeycloakSession;
+import org.keycloak.services.util.CacheControlUtil;
+import org.keycloak.services.util.P3PHelper;
 
 import javax.ws.rs.core.CacheControl;
 import javax.ws.rs.core.Response;
@@ -37,7 +39,7 @@ public class IframeUtil {
             cacheControl = CacheControlUtil.noCache();
         }
 
-        InputStream resource = IframeUtil.class.getClassLoader().getResourceAsStream(fileName);
+        InputStream resource = IframeUtil.class.getResourceAsStream(fileName);
         if (resource != null) {
             P3PHelper.addP3PHeader();
             session.getProvider(SecurityHeadersProvider.class).options().allowAnyFrameAncestor();
diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java
index aa1b0eea36c..955216517da 100755
--- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java
+++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java
@@ -33,7 +33,7 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 import java.util.Set;
 
-import static org.keycloak.services.util.IframeUtil.returnIframeFromResources;
+import static org.keycloak.protocol.oidc.endpoints.IframeUtil.returnIframeFromResources;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java
index e952963fd20..5be41eb2329 100644
--- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java
+++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java
@@ -27,7 +27,7 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 
-import static org.keycloak.services.util.IframeUtil.returnIframeFromResources;
+import static org.keycloak.protocol.oidc.endpoints.IframeUtil.returnIframeFromResources;
 
 /**
  * @author Vaclav Muzikar <vmuzikar@redhat.com>
diff --git a/adapters/oidc/js/static/3p-cookies-step1.html b/services/src/main/resources/org/keycloak/protocol/oidc/endpoints/3p-cookies-step1.html
similarity index 100%
rename from adapters/oidc/js/static/3p-cookies-step1.html
rename to services/src/main/resources/org/keycloak/protocol/oidc/endpoints/3p-cookies-step1.html
diff --git a/adapters/oidc/js/static/3p-cookies-step2.html b/services/src/main/resources/org/keycloak/protocol/oidc/endpoints/3p-cookies-step2.html
similarity index 100%
rename from adapters/oidc/js/static/3p-cookies-step2.html
rename to services/src/main/resources/org/keycloak/protocol/oidc/endpoints/3p-cookies-step2.html
diff --git a/adapters/oidc/js/static/login-status-iframe.html b/services/src/main/resources/org/keycloak/protocol/oidc/endpoints/login-status-iframe.html
similarity index 100%
rename from adapters/oidc/js/static/login-status-iframe.html
rename to services/src/main/resources/org/keycloak/protocol/oidc/endpoints/login-status-iframe.html