Move formulas into their own directory and give them better names