Move functions to be sourced by all shells