Restructured views folder