Change functions to utils.
Moves constants in one file
Puts return type and function name in the same line.
Merge branch 'marc-refactor' into next