diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index 6eb03b577f7bd1ffb3a6069fcbc6ffd788b0a1db..07e856f8ecd53feb0f45ad03fed85748b84b536d 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -21,7 +21,6 @@
         <relativePath>../smp-parent-pom/pom.xml</relativePath>
     </parent>
     <artifactId>smp-server-library</artifactId>
-    <packaging>bundle</packaging>
     <name>smp-server-library</name>
 
     <!-- Default values for local compilation. The properties can be overriden for continuous integration servers -->
@@ -196,19 +195,5 @@
                 </includes>
             </testResource>
         </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>
-                            eu.europa.ec.cipa.smp.server.*
-                        </Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>
diff --git a/smp-webapp/pom.xml b/smp-webapp/pom.xml
index a9a1ad19e4734fdf6a9c0fb05fbde6edd9f233db..6d947800cb811e1067b25fa3dda9a72c5b31868d 100644
--- a/smp-webapp/pom.xml
+++ b/smp-webapp/pom.xml
@@ -117,8 +117,8 @@
                     <warName>${project.artifactId}</warName>
                     <webResources>
                         <resource>
-                            <directory>${basedir}/src/main/webapp/web</directory>
-                            <targetPath>web</targetPath>
+                            <directory>${basedir}/src/main/webapp/static_resources</directory>
+                            <targetPath>static_resources</targetPath>
                             <filtering>true</filtering>
                         </resource>
                     </webResources>
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpWebAppConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpWebAppConfig.java
index 4d1ab0ef7770083f9ce7ed493fefa51fe4271591..25eec86d33d9f08d42654f75206808057321efe0 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpWebAppConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpWebAppConfig.java
@@ -30,18 +30,20 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
         "eu.europa.ec.edelivery.smp.controllers",
         "eu.europa.ec.edelivery.smp.validation"})
 @Import({GlobalMethodSecurityConfig.class, ErrorMappingControllerAdvice.class})
-public class SmpWebAppConfig extends WebMvcConfigurerAdapter {
+public class SmpWebAppConfig implements WebMvcConfigurer {
 
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/").setViewName("index.html");
+        registry.addViewController("/").setViewName("/index.html");
+        //Home page used by SMP 2.x and 3.x - needed for backward compatibility in some EC's environments
+        registry.addViewController("/web/index.html").setViewName("/index.html");
     }
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.setOrder(HIGHEST_PRECEDENCE)
                 .addResourceHandler("/index.html", "/favicon-16x16.png")
-                .addResourceLocations("/web/");
+                .addResourceLocations("/static_resources/");
     }
 
     @Override
diff --git a/smp-webapp/src/main/webapp/web/favicon-16x16.png b/smp-webapp/src/main/webapp/static_resources/favicon-16x16.png
similarity index 100%
rename from smp-webapp/src/main/webapp/web/favicon-16x16.png
rename to smp-webapp/src/main/webapp/static_resources/favicon-16x16.png
diff --git a/smp-webapp/src/main/webapp/web/index.html b/smp-webapp/src/main/webapp/static_resources/index.html
similarity index 100%
rename from smp-webapp/src/main/webapp/web/index.html
rename to smp-webapp/src/main/webapp/static_resources/index.html