Simplify structure and prepare to create object factory
Write classes in Moose
streamline method names