Filestructure reorg