Improved file system structure