Normalised functions into separate files