Organised structure.

Gave avatar its own file and object structure.