Use the Project Manager (select "Windows| Project Manager") to organize diagram in folders, rename diagrams, folders, etc.