Move stuff to more sensible locations.