Moving functions in the includes folder