Making test site live

Hi

I have a live site at http://www.example.co.uk
I have a test site at http://www.example.co.uk/new

I’d like to make the test site live without having to move things around.

I think I want two things

1) Redirect http://www.example.co.uk/… to http://www.example.co.uk/new/…
2) Rewrite http://www.example.co.uk/new/… to http://www.example.co.uk/…

Can someone point me in the right direction please, any help appreciated, thanks.