base - allow stageswitch on context dropping the switch messages
io - adjust paths to clean scheme