Moving stuff to proper places