Simple and tidy 18650 battery holder. You can use 1 just by itself, or multiple to stack the batteries horizontally.

You can scale this up/down 1-3% for a more snug/loose fit.