Merged functions and aliases to one file.
More renaming.
Shell common things.
ZSH things.