I can identify - I'm in the middle of a workshop reorg, too.  You've got some good ideas here, which I think I may need to appropriate.  😀