Move uploadable avatar stuff into a concern