reorganized formula directives.

this time I'm 100% sure I used 'git mv'. I have no clue why this is shown as new file.