diff --git a/ansible/roles/onr-tomcat/defaults/main.yml b/ansible/roles/onr-web/defaults/main.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/defaults/main.yml
rename to ansible/roles/onr-web/defaults/main.yml
diff --git a/ansible/roles/onr-tomcat/meta/main.yml b/ansible/roles/onr-web/meta/main.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/meta/main.yml
rename to ansible/roles/onr-web/meta/main.yml
diff --git a/ansible/roles/onr-tomcat/tasks/add_groups.yml b/ansible/roles/onr-web/tasks/add_groups.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/add_groups.yml
rename to ansible/roles/onr-web/tasks/add_groups.yml
diff --git a/ansible/roles/onr-tomcat/tasks/add_response_file.yml b/ansible/roles/onr-web/tasks/add_response_file.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/add_response_file.yml
rename to ansible/roles/onr-web/tasks/add_response_file.yml
diff --git a/ansible/roles/onr-tomcat/tasks/assign_permissions.yml b/ansible/roles/onr-web/tasks/assign_permissions.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/assign_permissions.yml
rename to ansible/roles/onr-web/tasks/assign_permissions.yml
diff --git a/ansible/roles/onr-tomcat/tasks/extract_files.yml b/ansible/roles/onr-web/tasks/extract_files.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/extract_files.yml
rename to ansible/roles/onr-web/tasks/extract_files.yml
diff --git a/ansible/roles/onr-tomcat/tasks/get_facts.yml b/ansible/roles/onr-web/tasks/get_facts.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/get_facts.yml
rename to ansible/roles/onr-web/tasks/get_facts.yml
diff --git a/ansible/roles/onr-tomcat/tasks/install_packages.yml b/ansible/roles/onr-web/tasks/install_packages.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/install_packages.yml
rename to ansible/roles/onr-web/tasks/install_packages.yml
diff --git a/ansible/roles/onr-tomcat/tasks/install_tomcat.yml b/ansible/roles/onr-web/tasks/install_tomcat.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/install_tomcat.yml
rename to ansible/roles/onr-web/tasks/install_tomcat.yml
diff --git a/ansible/roles/onr-tomcat/tasks/main.yml b/ansible/roles/onr-web/tasks/main.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/main.yml
rename to ansible/roles/onr-web/tasks/main.yml
diff --git a/ansible/roles/onr-tomcat/tasks/post_installation_config.yml b/ansible/roles/onr-web/tasks/post_installation_config.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/post_installation_config.yml
rename to ansible/roles/onr-web/tasks/post_installation_config.yml
diff --git a/ansible/roles/onr-tomcat/tasks/retrieve_files.yml b/ansible/roles/onr-web/tasks/retrieve_files.yml
similarity index 100%
rename from ansible/roles/onr-tomcat/tasks/retrieve_files.yml
rename to ansible/roles/onr-web/tasks/retrieve_files.yml
diff --git a/ansible/roles/onr-tomcat/templates/context.xml b/ansible/roles/onr-web/templates/context.xml
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/context.xml
rename to ansible/roles/onr-web/templates/context.xml
diff --git a/ansible/roles/onr-tomcat/templates/properties/BILogon.properties b/ansible/roles/onr-web/templates/properties/BILogon.properties
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/properties/BILogon.properties
rename to ansible/roles/onr-web/templates/properties/BILogon.properties
diff --git a/ansible/roles/onr-tomcat/templates/properties/CmcApp.properties b/ansible/roles/onr-web/templates/properties/CmcApp.properties
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/properties/CmcApp.properties
rename to ansible/roles/onr-web/templates/properties/CmcApp.properties
diff --git a/ansible/roles/onr-tomcat/templates/properties/FioriBI.properties b/ansible/roles/onr-web/templates/properties/FioriBI.properties
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/properties/FioriBI.properties
rename to ansible/roles/onr-web/templates/properties/FioriBI.properties
diff --git a/ansible/roles/onr-tomcat/templates/properties/OpenDocument.properties b/ansible/roles/onr-web/templates/properties/OpenDocument.properties
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/properties/OpenDocument.properties
rename to ansible/roles/onr-web/templates/properties/OpenDocument.properties
diff --git a/ansible/roles/onr-tomcat/templates/properties/PlatformServices.properties b/ansible/roles/onr-web/templates/properties/PlatformServices.properties
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/properties/PlatformServices.properties
rename to ansible/roles/onr-web/templates/properties/PlatformServices.properties
diff --git a/ansible/roles/onr-tomcat/templates/properties/biprws.properties b/ansible/roles/onr-web/templates/properties/biprws.properties
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/properties/biprws.properties
rename to ansible/roles/onr-web/templates/properties/biprws.properties
diff --git a/ansible/roles/onr-tomcat/templates/properties/global.properties b/ansible/roles/onr-web/templates/properties/global.properties
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/properties/global.properties
rename to ansible/roles/onr-web/templates/properties/global.properties
diff --git a/ansible/roles/onr-tomcat/templates/root/BIP_profile_icon.png b/ansible/roles/onr-web/templates/root/BIP_profile_icon.png
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/BIP_profile_icon.png
rename to ansible/roles/onr-web/templates/root/BIP_profile_icon.png
diff --git a/ansible/roles/onr-tomcat/templates/root/BIP_profile_menu_70pct.png b/ansible/roles/onr-web/templates/root/BIP_profile_menu_70pct.png
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/BIP_profile_menu_70pct.png
rename to ansible/roles/onr-web/templates/root/BIP_profile_menu_70pct.png
diff --git a/ansible/roles/onr-tomcat/templates/root/BIlogoff.jsp b/ansible/roles/onr-web/templates/root/BIlogoff.jsp
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/BIlogoff.jsp
rename to ansible/roles/onr-web/templates/root/BIlogoff.jsp
diff --git a/ansible/roles/onr-tomcat/templates/root/BrowserCheck.jsp b/ansible/roles/onr-web/templates/root/BrowserCheck.jsp
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/BrowserCheck.jsp
rename to ansible/roles/onr-web/templates/root/BrowserCheck.jsp
diff --git a/ansible/roles/onr-tomcat/templates/root/BrowserCheck_Offline.jsp b/ansible/roles/onr-web/templates/root/BrowserCheck_Offline.jsp
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/BrowserCheck_Offline.jsp
rename to ansible/roles/onr-web/templates/root/BrowserCheck_Offline.jsp
diff --git a/ansible/roles/onr-tomcat/templates/root/InfoView.ico b/ansible/roles/onr-web/templates/root/InfoView.ico
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/InfoView.ico
rename to ansible/roles/onr-web/templates/root/InfoView.ico
diff --git a/ansible/roles/onr-tomcat/templates/root/Unsupported_Browser.html b/ansible/roles/onr-web/templates/root/Unsupported_Browser.html
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/Unsupported_Browser.html
rename to ansible/roles/onr-web/templates/root/Unsupported_Browser.html
diff --git a/ansible/roles/onr-tomcat/templates/root/browsercheck.css b/ansible/roles/onr-web/templates/root/browsercheck.css
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/browsercheck.css
rename to ansible/roles/onr-web/templates/root/browsercheck.css
diff --git a/ansible/roles/onr-tomcat/templates/root/browsercheck.js b/ansible/roles/onr-web/templates/root/browsercheck.js
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/browsercheck.js
rename to ansible/roles/onr-web/templates/root/browsercheck.js
diff --git a/ansible/roles/onr-tomcat/templates/root/index.jsp b/ansible/roles/onr-web/templates/root/index.jsp
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/index.jsp
rename to ansible/roles/onr-web/templates/root/index.jsp
diff --git a/ansible/roles/onr-tomcat/templates/root/keepalive.htm b/ansible/roles/onr-web/templates/root/keepalive.htm
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/root/keepalive.htm
rename to ansible/roles/onr-web/templates/root/keepalive.htm
diff --git a/ansible/roles/onr-tomcat/templates/server.xml b/ansible/roles/onr-web/templates/server.xml
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/server.xml
rename to ansible/roles/onr-web/templates/server.xml
diff --git a/ansible/roles/onr-tomcat/templates/setenv.sh b/ansible/roles/onr-web/templates/setenv.sh
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/setenv.sh
rename to ansible/roles/onr-web/templates/setenv.sh
diff --git a/ansible/roles/onr-tomcat/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh b/ansible/roles/onr-web/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh
rename to ansible/roles/onr-web/templates/u01/app/bobj/BIP4/sap_bobj/init/setupinit.sh
diff --git a/ansible/roles/onr-tomcat/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini b/ansible/roles/onr-web/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini
rename to ansible/roles/onr-web/templates/u02/software/BIP_4_3_SP1/prereq_checks.ini
diff --git a/ansible/roles/onr-tomcat/templates/u02/software/BIP_4_3_SP1/tomcat_admin_response.ini b/ansible/roles/onr-web/templates/u02/software/BIP_4_3_SP1/tomcat_admin_response.ini
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/u02/software/BIP_4_3_SP1/tomcat_admin_response.ini
rename to ansible/roles/onr-web/templates/u02/software/BIP_4_3_SP1/tomcat_admin_response.ini
diff --git a/ansible/roles/onr-tomcat/templates/wdeploy.conf b/ansible/roles/onr-web/templates/wdeploy.conf
similarity index 100%
rename from ansible/roles/onr-tomcat/templates/wdeploy.conf
rename to ansible/roles/onr-web/templates/wdeploy.conf