Move Buffer class to separate file.