tdd-training-homework03 - A little structural reorganization.