File refactoring.
Doc updates.