Restructured files and directories