Move files up a level then delete empty folder

Update for people finding this thread later on:

The best solution is #2 Move Everything Up in this thread: