Move some stuff to where it belong