Portable LED Light Design Redesign

I am building this light for a friend who has a visual deficiency. The design was originally for a 110Volt incandescent light bulb. I am modifying it for portability, and to house a 3.7-volt battery and a tp-4056 USB-C charging module. The shade should be closed in to allow just the thin wire to pass through for power to the led mounts.
Statement of work:
1-The base snaps together and forms a single piece. It needs to be modified (make it thicker) to allow the 18650-type battery to fit inside and power the light.

2-For Safety the Battery requires a tp-4056 Module to charge the battery, and monitor for over and under charge conditions. This means I need a holder for the tp-4056, so that it does not move when the user is plugging in the USB-C charging cable. The base also needs a hole (USB-C) in the side to connect the cable to the tp-4056.

3- The shade was originally for an incandescent light bulb, I would to modify the interior to mount a plate for the LED light modules inside the shade. I would like the plate for the led lights to accommodate from One to Three - 33mm diameter LED modules. and
4-the top of the shade needs to be closed leaving just a small hole for the wire to pass to the LEDs.

Dimensions of the new components
Battery Holder: Outside dimensions 76mm Long X 21mm Wide x 22mm High
Wire Diameter: 3mm
LED Modules: Each of three… Diameter 31mm
TP-4046 Module: 27.2 Long X 20.3 Wide X 4.3mm High

NOTE: The three pieces that form the base are a snap fit today, meaning that they are a pressure fit, and stay together once snapped in place. It is critical that we maintain this feature.

I have the .stl files for the original build, and can forward these upon request.