Reorganized code structure.