0004 pre one and reorganization

This is the "0004 pre one" commit but reorganized wiki as suggested by
k2b6s9j.