Redid modularization structure.