Shiny restructure