add avatars(draft) and remove nested resources