Matterhorn, tomcat

More class modularization.