merge arm & x86 dirs into unix dir