Some more directory structure cleanup.

I will eventually merge the C and Charm++ versions into the src tree.