moved Tomcat code to plugin
cleanup/whitespace