Fix typos, move some files, rename stuff