Restructured public folder
Merge