Change structure to one submission per file to reduce merge conflicts