Move more functions from ~/bin to plugin