Mini solar lamps

Probably most of you have seen these type of solar lamp:

It has solar cells on top, a tiny LED like those found on power plugs and on/off buttons, 2 nimh batteries that get recharged by the solar cells, and a light sensor that turns the LED on/off depending on how bright it is outside.

I like the concept, but I don’t like the LED and the batteries.
What would be the easiest approach to get some lamps like that with Cree LEDs and 18650 cells ?
I’d fine with soldering, but I would prefer the batteries to be easily swappable.

westinghouse sells such a thing.
thats why you can buy 18650 and 18500 cells at walmart.
the ones in your pic are common $1 store items.