Reorganize files for submition