Use file utils
cleanup files
caching image download client
get rid of singleton