cleanup for restructuring
3 files changed