Move functions in the right file.