Updating the name yep, and I'm holding off on much reorg thoughts until @stpeter can actually dive in :)