Moved contents of trunk into root directory.
Cleaning up after flattening.