Moving utility classes

Just move some c# utility classes around