restructured the folders