Update #4145 by Henry: Update the structure for phonegap sakes
Update #4145 by Henry: Update the structure for phonegap sakes