Added ''real'' download of images.
Restructured some routes
Merge branch 'master' into testing