refactors image uploader classes