move images into /media and json into /data - although not yet used
+ various fixes in the if/def exo