cleanup for restructuring
31 files changed