restructured files and folders