pull out functions into .functions, rename aliases file