Lots of cleanup. Added tomcat module.