Fix ScenarioController to work with new hierarchy
Fix ScenarioController to work with new hierarchy

plrusek/NitoriWare,uulltt/NitoriWare,Barleytree/NitoriWare,Barleytree/NitoriWare,NitorInc/NitoriWare,NitorInc/NitoriWare