Modularization of Matterhorn and Tomcat modules
New classes, new submodule organization