separated ImageService and ThumbnailService; separated ImageStore