Move avatars to own class.