File structure reorg