Refactored Tomcat installation