Continued restructuring, baseline docs code complete