Cleaning after import from Google Code.

Some cleaning and organization after the import from Google Code (which
was using SVN).