version update
move some stuff to machine dependent folder