Reorganize functions in file.