Preliminary reorganization; some rewrites required