Moving functions into separate files
Set order of function loading