reorg and fixup mobile assests