restructured files into folders