restructure files ready for major pipeline