adjust structure for new fire.app