Moving stuff to more appropriate locations