Everything is now contained within the .app, so a re-install is rm -rf /Applications/Xcode.app and then re-install.
The command line tools are easily installed from within Xcode -> Preferences -> Downloads or by downloading the .dmg from Apple's developer website and installing it by hand. Neither are the end of the world.