restructure views