You can order the fields the way you like. You can make the country field come before the Address field but adjusting the Order. To adjust the order of a form, go to Form builder, set your ordering and then click on Save. Let me know if you need help with this.