Some reorganization. New doco.