Re-arrange structure. Simplify doc format.