Revert "separate Buff classes"

This reverts commit 7868f87eb3126378f7a4daa2aceff566cfd1ccb8.