Moved stuff to CSharp module.
Merge.