File-handling refactoring.
Finalizing SessionOrganizer.