Refactoring project to Tomcat 8