updated storyboard organization