Restructured layout by removing root folder