Issue #64: a bit of reorganizing