make re1 mac valid
move hirb, wirb to addition.rb