reorganised solution, added DryIoc