Move some private stuff down so public stuff easier to find

No actual code changes.