refactor file system structure