restructured the folder structure