Reorganize modules a bit.