File Structure reorg