One class per file for buffers.
Refactoring.