[master] Reorganize storyboard