Move Buffer class to its new home