Moved image related stuff in new package