Moved Buffer Class to the utils package