I edc spare 18650`s in clear plastic boxes. Two boxes with two batteries in each = 4 x 18650. Plus plastic boxes with AA Eneloops, four Eneloops in two boxes = 8 x AA Eneloop. Keep them in a Pocket Organizer-pouch, in my the pocket of my Fjällräven vest.
EDC-lights are Fenix TK22 and Zebralight...