Changes packages and class hierarchy. Adds malt calculations and tests.