more aliases and functions, rename some files