Further reorganizing...
Setting up multi-doc module. Expanding unit tests.