Move more stuff to ./tmp