File system restructured