client: move image uploader to step 1