Changed some jspx files to html to be able to use them also with the service-based approach.
Testing