Moving more things into bash-tools