Refactors Image Service module