Fixed documentation and performed some reorganizations...