Continuing documentation / re-org.