Minor moves of functions into their own files