Soon I will need to do non B visa extension at immigration office.

But I am also in the prices of moving the office.

Since for extension photos of work place are required, should I move office before, and take photo at new place.

Or take photo at new place and then move?

The problem is that when we file for moving office, it takes several weeks for it to show on company papers, and that would be too late for visa extension.

But also we can't continue stay at old place, since lease is running out.

I am leaning toward apply for visa extension with pics at old place, and then start the process of moving to new office.

I would take the photos at the old (current) place and apply for the extension now, it you're within 30 days of expiration of your current permission to stay.