Reorganized code location within files.