Some git repository cleanups

[Jonathan Carter <jcarter@linux.com>]

Hi

I made some sweeping changes in the git repository so I suggest doing a 
pull before making any further changes:

 * rename directories to be a bit more consistent
 * remove duplicate files
 * merge nearly identical logo directories
 * move some directories to subdirectories

-Jonathan