Removed unnecessary packaging of embedded Tomcat components.