Restructured views dir