More reorganization
Little more organization and access to JSZip