Embodiments of the present invention relate generally to lithium-ion batteries, and more specifically, to batteries having integrated separators and methods of fabricating such batteries. In one embodiment, a lithium-ion battery having an electrode structure is provided. The lithium-ion battery comprises an anode stack, a cathode stack, and a porous electrospun polymer separator comprising a nano-fiber backbone structure. The anode stack comprises an anodic current collector and an anode structure formed over a first surface of the anodic current collector. The cathode stack comprises a cathodic current collector and a cathode structure formed over a first surface of the cathodic current collector. The porous electrospun polymer separator is positioned between the anode structure and the cathode structure.