Refactoring avatar classes

Removing need to inject container into avatar service. Also removed over-complication of avatar service resolving adapter.