reorg of fs structure