CS-5496 - Move templates service from classes construct & improvement for errors handing when uploading images