I did a few minor things like moving extension fun...

# kobalt

[cedric]

I did a few minor things like moving extension functions in their proper class (I avoid using extension functions for classes that I control)