Reorganised folders and added archive download