Re-org of docs and code.