Restructure folders and spelling correction
Restructure folders and spelling correction