Restructure views