Reorganize Modal file
Remove temp file