Restructure and upload