Reorganized, and stub documentation