Re-structure file system take 2