Reorganized forms into sub-modules.