Yay modularization