Final modularization of classes. One class per header!