move stuff around a bit
add grub2 back