server files reorg