Separation of Buff classes

include the new classes