Move stuff to be in the workspace