Consolidate aikido and iaido main pages