It's all in packages now, more singleton stuff

thanks donald