Move out some stuff to its proper place, fix CS.