Some functions were moved.
Minor changes