Package reorganization; documentation edits