Organize and fixup brewfiles