restructured the files into folders