[Master] Restructured views tree