Changing URL… New URL, Same Server

Hello.
I think I have a bit of a different question in regards to the normal “moving wordpress” deal.

In my case, I am making a site for my boss. He already had a site and his package was set to expire with godaddy, so I made him one with my friend’s hosting.

We left up his main domain name [.com] and put [.net] on the new host. I began doing the work on [.net] intending to add [.com] whenever my work was complete.

I finished all my work on [.net] and added [.com] to the hosting package, but for now [.com] redirects to [.net] but he prefers the main URL to always be [.com]

I was wondering if there is a simple way to just move the folder from [.net] over to [.com] and update the URLS in the wordpress settings so that [.com] will be used instead.

Thanks!