Moving functions around to their proper file.