[image-spark] update file structure
Merge remote-tracking branch 'schischu/master'