Some major modularization work.