Restructured the folder structure