Move stuff to non-project, delete nonproj