Make them more modularized.