utilities for restructuring
16 files changed