Move generators around - clean up some oversights