Moved to "tomcat" submodule