reorganize files, set up formatting for final versions