Move beans into their own class.