Working on a site called http://www.ConwayandWhitman.com.
I did not build or implement the site from the beginning, I just came in later to help manage it. There was a previous version of the site, not on WordPress, and now they are using WP, but all of the WP files are in a file called "newsite" on the server, so now when you go to http://www.conwayandwhitman.com, it automatically redirects to "www.conwayandwhitman.com/newsite."
I want the site to go back to only "www.conwayandwhitman.com". Is this as simple as changing the WP URL and Blog URL in the "Settings" menu within WordPress? Do I need to change anything else? This isn't domain forwarding since they are not using a different domain, but how do I change this?