Firebase reorg 2