Add Tomcat service configuration, some cleanup.