moving img functions to seperate class
Merge branch 'develop'

* develop:
  moving img functions to seperate class