Moving functions to 1 file per function