Moving stuff to the proper place.