restructure baby for mobiengine