cleanup for restructuring
7 files changed